From: Chris Gianelloni Date: Fri, 8 Feb 2008 23:11:37 +0000 (+0000) Subject: Fix up calc_contents in contents_map. Thanks to Brent Baude ... X-Git-Tag: CATALYST_2_0_6_916~202 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d31d0e9649db5cd09faa8b22e43c5c47d31a0f2;p=catalyst.git Fix up calc_contents in contents_map. Thanks to Brent Baude for pointing it out. This is catalyst 2.0.6_pre3 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1292 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index b90b37cc..e12e2678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Feb 2008; Chris Gianelloni catalyst, + modules/catalyst_support.py: + Fix up calc_contents in contents_map. Thanks to Brent Baude + for pointing it out. This is catalyst 2.0.6_pre3 for + testing. + 08 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh: Ensure /etc/xml/catalog does not exist in stage1, since it will always be diff --git a/catalyst b/catalyst index cea85ccb..25dc9ba7 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.6_pre2" +__version__="2.0.6_pre3" conf_values={} diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index a79e9dfd..a9054f97 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.py @@ -101,13 +101,13 @@ def calc_contents(file,cmd,verbose): 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"], + #"find" :[calc_contents,"find %(path)s"], + "tar-tv":[calc_contents,"tar tvf %(file)s"], + "tar-tvz":[calc_contents,"tar tvzf %(file)s"], + "tar-tvj":[calc_contents,"tar tvjf %(file)s"], + "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], # isoinfo-f should be a last resort only - "isoinfo-f":[calc_content,"isoinfo -f -i %(file)s"], + "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], } def generate_hash(file,hash_function="crc32",verbose=False):