Add more verbosity to digests if -V is enabled, add more print messages to grp digest...

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

diff --git a/ChangeLog b/ChangeLog
index d1200d99864c55358b6fbaf96984c82a9dad4df3..1b4d912604106d22504e99d9091cb00d05ee7fee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.412 2005/12/02 01:58:02 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.413 2005/12/02 15:14:26 rocket Exp $
+
+  02 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py, modules/grp_target.py:
+  Add more verbosity to digests if -V is enabled, add more print messages to
+  grp digesting code
 
   02 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py,
   modules/generic_stage_target.py, modules/grp_target.py:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 2b217d4856c15ff89b291dd7eb0b072f129d8a06..b1ad64203518ad212957f4d455a478fd97221d04 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.82 2005/12/02 01:58:02 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.83 2005/12/02 15:14:27 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -1205,11 +1205,17 @@ class generic_stage_target(generic_target):
                     myf=open(file+".digests","w")
 
                     if self.settings.has_key("MD5"):
-                        md5=calc_md5(file)
+                       if self.settings.has_key("VERBOSE"):
+                           md5=calc_md5(file,True)
+                       else:
+                           md5=calc_md5(file)
                         myf.write("MD5: "+md5+"\n")
 
                     if self.settings.has_key("SHA"):
-                        sha=calc_sha(file)
+                       if self.settings.has_key("VERBOSE"):
+                           sha=calc_sha(file,True)
+                       else:
+                           sha=calc_sha(file)
                         myf.write("SHA: "+sha+"\n")
 
                     myf.close()

diff --git a/modules/grp_target.py b/modules/grp_target.py
index c0e41a7be8b1fa3e7f5a5e9fb2611b4fd7d90e68..019045704f6614b35a25d9ef1bf782b5da550b6c 100644 (file)
--- a/modules/grp_target.py
+++ b/modules/grp_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/grp_target.py,v 1.17 2005/12/02 01:58:02 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.18 2005/12/02 15:14:27 rocket Exp $
 
 """
 The builder class for GRP (Gentoo Reference Platform) builds.
@@ -82,7 +82,7 @@ class grp_target(generic_stage_target):
                for pkgset in self.settings["grp"]:
                    if self.settings["grp/"+pkgset+"/type"] == "pkgset":
                        destdir=normpath(self.settings["target_path"]+"/"+pkgset+"/All")
-                       
+                       print "Digesting files in the pkgset....."                      
                        digests=glob.glob(destdir+'/*.digests')
                        for i in digests:
                            if os.path.exists(i):
@@ -96,6 +96,7 @@ class grp_target(generic_stage_target):
                                self.gen_digest_file(normpath(destdir+"/"+i))
                    else:
                        destdir=normpath(self.settings["target_path"]+"/"+pkgset)
+                       print "Digesting files in the srcset....."                      
                        
                        digests=glob.glob(destdir+'/*.digests')
                        for i in digests: