[Fedora-livecd-list] [PATCH] Few tab issues to get it running
bkearney at redhat.com
bkearney at redhat.com
Mon Nov 3 20:25:01 UTC 2008
From: Bryan Kearney <bkearney at redhat.com>
---
imgcreate/kickstart.py | 2 +-
tools/livecd-creator | 26 ++++++++++++--------------
2 files changed, 13 insertions(+), 15 deletions(-)
mode change 100644 => 100755 tools/livecd-iso-to-disk.sh
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index b5f3a43..ba2822b 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -160,7 +160,7 @@ class TimezoneConfig(KickstartConfig):
try:
shutil.copyfile(self.path("/usr/share/zoneinfo/%s" %(tz,)),
self.path("/etc/localtime"))
- except OSError, (errno, msg):
+ except OSError, (errno, msg):
log.error("Error copying timezone: %s" %(msg,))
diff --git a/tools/livecd-creator b/tools/livecd-creator
index cd6ef08..170995f 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -117,22 +117,20 @@ def main():
creator.skip_minimize = options.skip_minimize
try:
- try:
- creator.mount(options.base_on, options.cachedir)
- creator.install()
- creator.configure()
- if options.give_shell:
- print "Launching shell. Exit to continue."
- print "----------------------------------"
- creator.launch_shell()
- creator.unmount()
- creator.package()
- except imgcreate.CreatorError, e:
- print >> sys.stderr, "Error creating Live CD : %s" % e
- return 1
+ creator.mount(options.base_on, options.cachedir)
+ creator.install()
+ creator.configure()
+ if options.give_shell:
+ print "Launching shell. Exit to continue."
+ print "----------------------------------"
+ creator.launch_shell()
+ creator.unmount()
+ creator.package()
+ except imgcreate.CreatorError, e:
+ print >> sys.stderr, "Error creating Live CD : %s" % e
+ return 1
creator.cleanup()
-
return 0
if __name__ == "__main__":
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
old mode 100644
new mode 100755
--
1.5.5.1
More information about the Fedora-livecd-list
mailing list