From 092a1e413b15c817567720fe4a57eac54f86d1f0 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 2 Dec 2005 15:14:27 +0000 Subject: [PATCH] Add more verbosity to digests if -V is enabled, add more print messages to grp digesting code git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@925 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- modules/generic_stage_target.py | 12 +++++++++--- modules/grp_target.py | 5 +++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1200d99..1b4d9126 100644 --- 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 + 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 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 2b217d48..b1ad6420 100644 --- 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 c0e41a7b..01904570 100644 --- 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: -- 2.26.2