Fix DIGESTS output

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

diff --git a/ChangeLog b/ChangeLog
index 8d17e75dd509b04991931a79f4c6fd932431d82e..ff3f82db26fff8464eb2a5294f4d4f4ebebf50f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.623 2006/05/18 00:35:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.624 2006/05/19 16:25:20 rocket Exp $
+
+  19 May 2006; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py,
+  modules/generic_stage_target.py:
+  Fix DIGESTS output
 
   16 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/rc-update.sh:

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 2aaf1630462e55993a7483c3b8eb47b47d334e7a..90fe8d3765583215e29cd64f92f926040e196320 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.73 2006/05/03 22:18:38 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.74 2006/05/19 16:25:20 rocket Exp $
 
 import sys,string,os,types,re,signal,traceback,time
 #import md5,sha
@@ -89,7 +89,7 @@ def calc_hash2(file,cmd,cmd_args,id_string="MD5",verbose=False):
        hash=mylines[0]
        short_file=os.path.split(mylines[1])[1]
        a.close()
-       result=header+hash+" "+short_file
+       result=header+hash+" "+short_file+"\n"
        if verbose:
                print header+" (%s) = %s" % (short_file, result)
        return result

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 54b1ec821f6407f3af94124355dc831f90d38e57..ee9141a7d44f8b9bae997685cfa44029af23e5d6 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.133 2006/04/25 17:13:28 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.134 2006/05/19 16:25:20 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -1359,12 +1359,12 @@ class generic_stage_target(generic_target):
                                        keys[i]=1
                                        array=keys.keys()
                                        array.sort()
-                                       for i in array:
-                                               if self.settings.has_key("VERBOSE"):
-                                                       hash=generate_hash(file,hash_function=i,verbose=True)
-                                               else:
-                                                       hash=generate_hash(file,hash_function=i)
-                                               myf.write(hash)
+                               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)
                                myf.close()
 
        def purge(self):