fix typo in getopt call for --clear-autoresume. thanks to

Tais M. Hansen <tais.hansen@osd.dk> in bug #188339 for catching this

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1235 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 79cae21e2a34f9d47529e2fb2bbc2fbf6c3a4d2b..ae2fd84877178cc7051368c5a2f27d6ac3114956 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Aug 2007; Andrew Gaffney <agaffney@gentoo.org> catalyst,
+  modules/generic_stage_target.py, modules/netboot2_target.py:
+  fix typo in getopt call for --clear-autoresume. thanks to
+  Tais M. Hansen <tais.hansen@osd.dk> in bug #188339 for catching this
+
   17 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/netboot2_target.py, targets/netboot2/netboot2-copyfile.sh,
   targets/support/netboot2-final.sh:

diff --git a/catalyst b/catalyst
index a8c07ee029341ca07251baa0a8fe80ab618dc694..e8f72b19ef16df4072889b13d0bad9203c9ed7c9 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -221,7 +221,7 @@ if __name__ == "__main__":
        # parse out the command line arguments
        try:
                opts,args = getopt.getopt(sys.argv[1:], "aphvdc:C:f:FVs:", ["purge","help", "version", "debug",\
-                       "clear_autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
+                       "clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
        
        except getopt.GetoptError:
                usage()

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 59dd37faf8ea3b1be6b5b99f567548992218506d..f9e3eca5ea84edf282a203e3a34705ed3a16cf97 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -882,7 +882,8 @@ class generic_stage_target(generic_target):
                        myf=open(self.settings["chroot_path"]+"/etc/make.conf","w")
                        myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n")
                        myf.write("# Please consult /etc/make.conf.example for a more detailed example.\n")
-                       myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
+                       if self.settings.has_key("CFLAGS"):
+                               myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
                        if self.settings.has_key("CXXFLAGS"):
                                myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n')
                        else:

diff --git a/modules/netboot2_target.py b/modules/netboot2_target.py
index 3738062a9f5e4f91a766e0a35cd4796e373d39ec..3716939d2a3ddc81d62c2cc1c9b49fab92513d2c 100644 (file)
--- a/modules/netboot2_target.py
+++ b/modules/netboot2_target.py
@@ -99,7 +99,7 @@ class netboot2_target(generic_stage_target):
                                for x in self.settings["netboot2/overlay"]: 
                                        if os.path.exists(x):
                                                cmd("rsync -a "+x+"/ "+\
-                                                       self.settings["chroot_path"], "netboot2/overlay: "+x+" copy failed.",env=self.env)
+                                                       self.settings["chroot_path"] + self.settings["merge_path"], "netboot2/overlay: "+x+" copy failed.",env=self.env)
                                touch(self.settings["autoresume_path"]+"setup_overlay")
 
        def move_kernels(self):