From 0666347e0ad4dccad4a5ad013f41a2f3b98676a1 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Mon, 13 Aug 2007 20:16:10 +0000 Subject: [PATCH] fix typo in getopt call for --clear-autoresume. thanks to Tais M. Hansen in bug #188339 for catching this git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1235 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ catalyst | 2 +- modules/generic_stage_target.py | 3 ++- modules/netboot2_target.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79cae21e..ae2fd848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Aug 2007; Andrew Gaffney catalyst, + modules/generic_stage_target.py, modules/netboot2_target.py: + fix typo in getopt call for --clear-autoresume. thanks to + Tais M. Hansen in bug #188339 for catching this + 17 Apr 2007; Chris Gianelloni modules/netboot2_target.py, targets/netboot2/netboot2-copyfile.sh, targets/support/netboot2-final.sh: diff --git a/catalyst b/catalyst index a8c07ee0..e8f72b19 100755 --- 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 59dd37fa..f9e3eca5 100644 --- 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 3738062a..3716939d 100644 --- 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): -- 2.26.2