remove redundant set_pkgcache_path() functions from tinderbox and grp modules

remove extra pkgcache_path and kerncache_path options from example specs

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

diff --git a/ChangeLog b/ChangeLog
index 36872c6b5531c9cfd0bbffe1300532ee37126d50..474b8803aa500ea2e36a246d31908fc7758a4258 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Sep 2007; Andrew Gaffney <agaffney@gentoo.org>
+  examples/netboot_template.spec, examples/tinderbox_template.spec,
+  modules/grp_target.py, modules/tinderbox_target.py:
+  remove redundant set_pkgcache_path() functions from tinderbox and grp modules
+  remove extra pkgcache_path and kerncache_path options from example specs
+
   31 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst:
   This is catalyst 2.0.5_pre3 for testing the new stages code.
 

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 3263a967affd4195f59760fc9e692bd6010cb4b3..3564cc30a495b91b43e88807f8e0108638baac9b 100644 (file)
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -147,9 +147,3 @@ netboot/packages/reiserfsprogs/files:
 # netboot/extra_files: /lib/libresolv.so.2 /lib/libnss_compat.so.2 /lib/libnss_dns.so.2 /lib/libnss_files.so.2 /sbin/consoletype
 netboot/extra_files:
 
-# Setting the option overrides the location of the pkgcache
-pkgcache_path:
-
-# Setting the option overrides the location of the kerncache
-kerncache_path:
-

diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec
index 2d70ffa86e9dbf5fe062a379414eccb5eeaeccff..448263a3e824070ca7ce0b8084232cdcfda24826 100644 (file)
--- a/examples/tinderbox_template.spec
+++ b/examples/tinderbox_template.spec
@@ -85,9 +85,6 @@ tinderbox/use:
 # tinderbox/packages: dante tsocks sys-apps/eject minicom links acpid apmd parted whois tcpdump cvs zip unzip netcat partimage app-admin/sudo app-cdr/cdrtools gnome emacs dev-lang/ruby enlightenment kde mozilla-firefox mozilla-thunderbird xfce4 openbox fluxbox sylpheed openoffice-bin gimp xemacs xmms abiword gaim xchat pan tetex xcdroast k3b samba nmap gradm ettercap ethereal mplayer
 tinderbox/packages:
 
-# Setting the option overrides the location of the pkgcache
-pkgcache_path:
-
 # Setting the option overrides the location of the kerncache
 kerncache_path:
 

diff --git a/modules/grp_target.py b/modules/grp_target.py
index 036b41bb34dee85a1bb13b65400ef535439cc433..b7a0770b10d052307eaa4346de334cb5a7b7285e 100644 (file)
--- a/modules/grp_target.py
+++ b/modules/grp_target.py
@@ -58,13 +58,6 @@ class grp_target(generic_stage_target):
                                self.unbind()
                                raise CatalystError,"GRP build aborting due to error."
 
-        def set_pkgcache_path(self):
-            if self.settings.has_key("pkgcache_path"):
-                if type(self.settings["pkgcache_path"]) != types.StringType:
-                    self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"]))
-            else:
-                generic_stage_target.set_pkgcache_path(self)
-
        def set_use(self):
            generic_stage_target.set_use(self)
            if self.settings.has_key("use"):

diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py
index a1a66151abdc69ffadd89ee50e56ad2d0f067aae..42ad6eb8a656fec5a1a7fbe6720ffe3b5fa6d329 100644 (file)
--- a/modules/tinderbox_target.py
+++ b/modules/tinderbox_target.py
@@ -25,13 +25,6 @@ class tinderbox_target(generic_stage_target):
                        self.unbind()
                        raise CatalystError,"Tinderbox aborting due to error."
 
-       def set_pkgcache_path(self):
-               if self.settings.has_key("pkgcache_path"):
-                       if type(self.settings["pkgcache_path"]) != types.StringType:
-                               self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"]))
-                       else:
-                               generic_stage_target.set_pkgcache_path(self)
-       
        def set_cleanables(self):
            self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",\
                                        "/usr/portage"]