Fix up calc_contents in contents_map. Thanks to Brent Baude <ranger@gentoo.org>...

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 b90b37cc3a42ef48e5b1458a573f1373b06a86ee..e12e2678f284ae603d89ef874ecba2b0ced3419c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/catalyst_support.py:
+  Fix up calc_contents in contents_map. Thanks to Brent Baude
+  <ranger@gentoo.org> for pointing it out. This is catalyst 2.0.6_pre3 for
+  testing.
+
   08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   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 cea85ccb829483fd3dcc4ad77bf4f63dd7865a55..25dc9ba7a87c0f130c71175db19b4bc7ea982401 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__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 a79e9dfd8f85b832007bc77892af8fa10e65c026..a9054f97af46d39101a2c6b8e0170454ef964b19 100644 (file)
--- 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):