Catalyst should die if source_subpath is not a string
authorEric Edgar <rocket@gentoo.org>
Tue, 20 Dec 2005 22:51:00 +0000 (22:51 +0000)
committerEric Edgar <rocket@gentoo.org>
Tue, 20 Dec 2005 22:51:00 +0000 (22:51 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@993 d1e1f19c-881f-0410-ab34-b69fee027534

ChangeLog
modules/generic_stage_target.py

index 03f6ba409c579f166ea05e4ba981fa7f9c74ff55..16bd1120d5298afb68161995a4f58e668c0b2ad4 100644 (file)
--- 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.480 2005/12/20 22:44:45 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.481 2005/12/20 22:51:00 rocket Exp $
+
+  20 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  Catalyst should die if source_subpath is not a string
 
   20 Dec 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:
index 17edc5c4f285bcf9e34146564fa671215e007e78..5c718b9559ac60a434b6e6ed8c682fc0824d3427 100644 (file)
@@ -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.104 2005/12/20 22:44:45 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.105 2005/12/20 22:51:00 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -241,15 +241,9 @@ class generic_stage_target(generic_target):
                self.settings["target_subpath"]=self.settings["rel_type"]+"/"+self.settings["target"]+\
                        "-"+self.settings["subarch"]+"-"+self.settings["version_stamp"]
        
-        def set_source_subpath(self):
-                if type(self.settings["source_subpath"]) != types.StringType:
-                       print "WARNING WARNING WARNING"
-                       print "source_subpath should have been a string perhaps you have something wrong"
-                       print "\tin your spec file"
-                       print "\tUsing first element of array .. continuing .. other values may not"
-                       print "\tbe set as we are discarding extraneous specfile data"
-                       print "WARNING WARNING WARNING"
-                        self.settings["source_subpath"]=self.settings["source_subpath"][0]
+       def set_source_subpath(self):
+               if type(self.settings["source_subpath"]) != types.StringType:
+                       raise CatalystError, "source_subpath should have been a string. Perhaps you have something wrong in your spec file?"
 
        def set_pkgcache_path(self):
                self.settings["pkgcache_path"]=normpath(self.settings["storedir"]+"/packages/"+\