git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no real change, just made prettier with a more standard layout - half of steps
[bootmanager.git]
/
source
/
steps
/
ConfirmInstallWithUser.py
diff --git
a/source/steps/ConfirmInstallWithUser.py
b/source/steps/ConfirmInstallWithUser.py
index
8890fcc
..
7144e15
100644
(file)
--- a/
source/steps/ConfirmInstallWithUser.py
+++ b/
source/steps/ConfirmInstallWithUser.py
@@
-36,7
+36,7
@@
WARNING : Installing PlanetLab will remove any existing operating system and
"""
"""
-def Run(
vars, log
):
+def Run(
vars, log
):
"""
Ask the user if we really want to wipe this machine.
"""
Ask the user if we really want to wipe this machine.
@@
-44,25
+44,25
@@
def Run( vars, log ):
a BootManagerException if anything unexpected occurred.
"""
a BootManagerException if anything unexpected occurred.
"""
- log.write(
"\n\nStep: Confirming install with user.\n"
)
+ log.write(
"\n\nStep: Confirming install with user.\n"
)
try:
try:
- confirmation= ""
- install= 0
+ confirmation
= ""
+ install
= 0
print welcome_message
while confirmation not in ("yes","no"):
print welcome_message
while confirmation not in ("yes","no"):
- confirmation= \
- raw_input("Are you sure you wish to continue (yes/no):")
- install= confirmation=="yes"
- except EOFError
,
e:
+ confirmation
= \
+ raw_input("Are you sure you wish to continue (yes/no):
")
+ install
= confirmation=="yes"
+ except EOFError
as
e:
pass
pass
- except KeyboardInterrupt
,
e:
+ except KeyboardInterrupt
as
e:
pass
if install:
pass
if install:
- log.write(
"\nUser accepted install.\n"
)
+ log.write(
"\nUser accepted install.\n"
)
else:
else:
- log.write(
"\nUser canceled install.\n"
)
+ log.write(
"\nUser canceled install.\n"
)
return install
return install