From: Eric Edgar <rocket@gentoo.org>
Date: Mon, 7 Nov 2005 20:26:37 +0000 (+0000)
Subject: Fix modules has no attribute register
X-Git-Tag: CATALYST_2_0_6_916~614
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14e93ae99487dd709f50aea26344db6db0d4f2ac;p=catalyst.git

Fix modules has no attribute register


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

diff --git a/ChangeLog b/ChangeLog
index 04288d38..bf9728c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.370 2005/11/07 19:46:04 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.371 2005/11/07 20:26:37 rocket Exp $
+
+  07 Nov 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py, modules/stage1_target.py:
+  Fix modules has no attribute register
 
   07 Nov 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 74b52216..f9fc2a8b 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.73 2005/11/07 19:46:04 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.74 2005/11/07 20:26:37 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -11,7 +11,6 @@ import os,string,imp,types,shutil
 from catalyst_support import *
 from generic_target import *
 from stat import *
-import pdb
 import catalyst_lock
 class generic_stage_target(generic_target):
 
diff --git a/modules/stage1_target.py b/modules/stage1_target.py
index a9fab698..42fa9542 100644
--- a/modules/stage1_target.py
+++ b/modules/stage1_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage1_target.py,v 1.11 2005/11/07 16:25:06 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage1_target.py,v 1.12 2005/11/07 20:26:37 rocket Exp $
 
 """
 Builder class for a stage1 installation tarball build.
@@ -47,11 +47,11 @@ class stage1_target(generic_stage_target):
 		self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"])
 
         def override_ldflags(self):
-                if os.environ.has_key("LDFLAGS"):
-                    self.settings["LDFLAGS"] = os.environ["LDFLAGS"]
-                if self.settings.has_key("ldflags"):
-                    self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"])
+	    if os.environ.has_key("LDFLAGS"):
+		self.settings["LDFLAGS"] = os.environ["LDFLAGS"]
+	    if self.settings.has_key("ldflags"):
+		self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"])
 
-def reg(foo):
+def register(foo):
 	foo.update({"stage1":stage1_target})
 	return foo