diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | catalyst | 2 | ||||
| -rw-r--r-- | files/catalyst.conf | 12 | ||||
| -rw-r--r-- | modules/catalyst_support.py | 49 | ||||
| -rw-r--r-- | modules/generic_stage_target.py | 34 | ||||
| -rw-r--r-- | modules/grp_target.py | 2 | ||||
| -rw-r--r-- | modules/snapshot_target.py | 1 |
8 files changed, 100 insertions, 8 deletions
@@ -19,3 +19,4 @@ Joshua Kinard <kumba@gentoo.org> Lars Weiler <pylon@gentoo.org> Andrew Gaffney <agaffney@gentoo.org> Diego Pettenò <flameeyes@gentoo.org> +Robin H. Johnson <robbat2@gentoo.org> @@ -1,6 +1,13 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, catalyst, + files/catalyst.conf, modules/catalyst_support.py, + modules/generic_stage_target.py, modules/grp_target.py, + modules/snapshot_target.py: + Added support for generating CONTENTS files automatically. Patch by Robin + Johnson <robbat2@gentoo.org> for bug #207862. + 08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> modules/snapshot_target.py: Add a patch from Robin Johnson <robbat2@gentoo.org> from bug #207860 to @@ -147,6 +147,8 @@ def parse_config(myconfig): if myconf.has_key("digests"): conf_values["digests"]=myconf["digests"] + if myconf.has_key("contents"): + conf_values["contents"]=myconf["contents"] if myconf.has_key("envscript"): print "Envscript support enabled." diff --git a/files/catalyst.conf b/files/catalyst.conf index 452ac643..b4e2385f 100644 --- a/files/catalyst.conf +++ b/files/catalyst.conf @@ -9,6 +9,18 @@ # ripemd256, sha256, sha512, ripemd160, md5 digests="md5 sha1" +# Creates a .CONTENTS file listing the contents of the file. Pick from any of +# the supported options below: +# auto - strongly recommended +# tar-tv - does 'tar tvf FILE' +# tar-tvz - does 'tar tvzf FILE' +# tar-tvy - does 'tar tvyf FILE' +# isoinfo-l - does 'isoinfo -l -i FILE' +# isoinfo-f - does 'isoinfo -f -i FILE' +# 'isoinfo-f' is the only option not chosen by the automatic algorithm. +# If this variable is empty, no .CONTENTS will be generated at all. +contents="auto" + # distdir specifies where your distfiles are located. This setting should # work fine for most default installations. distdir="/usr/portage/distfiles" diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index a676fd19..a79e9dfd 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.py @@ -62,6 +62,54 @@ def hexify(str): return r # hexify() +def generate_contents(file,contents_function="auto",verbose=False): + try: + _ = contents_function + if _ is 'auto' and file.endswith('.iso'): + _ = 'isoinfo-l' + if (_ in ['tar-tv','auto']): + if file.endswith('.tgz') or file.endswith('.tar.gz'): + _ = 'tar-tvz' + elif file.endswith('.tbz2') or file.endswith('.tar.bz2'): + _ = 'tar-tvj' + elif file.endswith('.tar'): + _ = 'tar-tv' + + contents_function = _ + _ = contents_map[contents_function] + return _[0](file,_[1],verbose) + except: + raise CatalystError,\ + "Error generating contents, is appropriate utility (%s) installed on your system?" \ + % (contents_function, ) + +def calc_contents(file,cmd,verbose): + args={ 'file': file } + cmd=cmd % dict(args) + a=os.popen(cmd) + mylines=a.readlines() + a.close() + result="".join(mylines) + if verbose: + print result + return result + +# This has map must be defined after the function calc_content +# It is possible to call different functions from this but they must be defined +# before hash_map +# Key,function,cmd +contents_map={ + # 'find' is disabled because it requires the source path, which is not + # always available + #"find" :[calc_content,"find %(path)s"], + "tar-tv":[calc_content,"tar tvf %(file)s"], + "tar-tvz":[calc_content,"tar tvzf %(file)s"], + "tar-tvj":[calc_content,"tar tvjf %(file)s"], + "isoinfo-l":[calc_content,"isoinfo -l -i %(file)s"], + # isoinfo-f should be a last resort only + "isoinfo-f":[calc_content,"isoinfo -f -i %(file)s"], +} + def generate_hash(file,hash_function="crc32",verbose=False): try: return hash_map[hash_function][0](file,hash_map[hash_function][1],hash_map[hash_function][2],\ @@ -167,6 +215,7 @@ valid_config_file_values.append("SNAPCACHE") valid_config_file_values.append("snapshot_cache") valid_config_file_values.append("hash_function") valid_config_file_values.append("digests") +valid_config_file_values.append("contents") valid_config_file_values.append("SEEDCACHE") verbosity=1 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index a51abde4..f3400963 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -25,8 +25,8 @@ class generic_stage_target(generic_target): # The semantics of subarchmap and machinemap changed a bit in 2.0.3 to # work better with vapier's CBUILD stuff. I've removed the "monolithic" - # machinemap from this file and split up its contents amongst the various - # arch/foo.py files. + # machinemap from this file and split up its contents amongst the + # various arch/foo.py files. # # When register() is called on each module in the arch/ dir, it now # returns a tuple instead of acting on the subarchmap dict that is @@ -1051,6 +1051,7 @@ class generic_stage_target(generic_target): cmd("tar cjpf "+self.settings["target_path"]+" -C "+self.settings["stage_path"]+\ " .","Couldn't create stage tarball",env=self.env) + self.gen_contents_file(self.settings["target_path"]) self.gen_digest_file(self.settings["target_path"]) touch(self.settings["autoresume_path"]+"capture") @@ -1178,6 +1179,7 @@ class generic_stage_target(generic_target): if self.settings.has_key("iso"): cmd("/bin/bash "+self.settings["controller_file"]+" iso "+\ self.settings["iso"],"ISO creation script failed.",env=self.env) + self.gen_contents_file(self.settings["iso"]) self.gen_digest_file(self.settings["iso"]) touch(self.settings["autoresume_path"]+"create_iso") @@ -1387,6 +1389,23 @@ class generic_stage_target(generic_target): os.chown(myemp,mystat[ST_UID],mystat[ST_GID]) os.chmod(myemp,mystat[ST_MODE]) + + def gen_contents_file(self,file): + if os.path.exists(file+".CONTENTS"): + os.remove(file+".CONTENTS") + if self.settings.has_key("contents"): + if os.path.exists(file): + myf=open(file+".CONTENTS","w") + keys={} + for i in self.settings["contents"].split(): + keys[i]=1 + array=keys.keys() + array.sort() + for j in array: + contents=generate_contents(file,contents_function=j,verbose=self.settings.has_key("VERBOSE")) + myf.write(contents) + myf.close() + def gen_digest_file(self,file): if os.path.exists(file+".DIGESTS"): os.remove(file+".DIGESTS") @@ -1398,12 +1417,11 @@ class generic_stage_target(generic_target): keys[i]=1 array=keys.keys() array.sort() - for j in array: - if self.settings.has_key("VERBOSE"): - hash=generate_hash(file,hash_function=j,verbose=True) - else: - hash=generate_hash(file,hash_function=j) - myf.write(hash) + for f in [file, file+'.CONTENTS']: + if os.path.exists(f): + for j in array: + hash=generate_hash(f,hash_function=j,verbose=self.settings.has_key("VERBOSE")) + myf.write(hash) myf.close() def purge(self): diff --git a/modules/grp_target.py b/modules/grp_target.py index b7a0770b..ebaee604 100644 --- a/modules/grp_target.py +++ b/modules/grp_target.py @@ -84,6 +84,7 @@ class grp_target(generic_stage_target): files=[filename for filename in files if filename[0] != '.'] for i in files: if os.path.isfile(normpath(destdir+"/"+i)): + self.gen_contents_file(normpath(destdir+"/"+i)) self.gen_digest_file(normpath(destdir+"/"+i)) else: destdir=normpath(self.settings["target_path"]+"/"+pkgset) @@ -99,6 +100,7 @@ class grp_target(generic_stage_target): files=[filename for filename in files if filename[0] != '.'] for i in files: if os.path.isfile(normpath(destdir+"/"+i)): + self.gen_contents_file(normpath(destdir+"/"+i)) self.gen_digest_file(normpath(destdir+"/"+i)) def set_action_sequence(self): diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py index a99e9b58..94e40265 100644 --- a/modules/snapshot_target.py +++ b/modules/snapshot_target.py @@ -51,6 +51,7 @@ class snapshot_target(generic_stage_target): cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\ "Snapshot creation failure",env=self.env) + self.gen_contents_file(self.settings["snapshot_path"]) self.gen_digest_file(self.settings["snapshot_path"]) self.cleanup() |