From cd23ea290a0543fa2190d9412492ba715f427d2c Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Thu, 6 Sep 2007 21:18:19 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ examples/netboot_template.spec | 6 ------ examples/tinderbox_template.spec | 3 --- modules/grp_target.py | 7 ------- modules/tinderbox_target.py | 7 ------- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36872c6b..474b8803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Sep 2007; Andrew Gaffney + 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 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 3263a967..3564cc30 100644 --- 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 2d70ffa8..448263a3 100644 --- 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 036b41bb..b7a0770b 100644 --- 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 a1a66151..42ad6eb8 100644 --- 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"] -- 2.26.2