From: Eric Edgar <rocket@gentoo.org>
Date: Tue, 14 Feb 2006 15:38:12 +0000 (+0000)
Subject: fix for .DIGESTS.DIGESTS issue in grp
X-Git-Tag: CATALYST_2_0_6_916~407
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b4b951fcef85764cdb9b58bed286358fbc800f7;p=catalyst.git

fix for .DIGESTS.DIGESTS issue in grp


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

diff --git a/ChangeLog b/ChangeLog
index daf5813d..4aa048f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.572 2006/02/14 15:29:39 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.573 2006/02/14 15:38:12 rocket Exp $
+
+  14 Feb 2006; Eric Edgar <rocket@gentoo.org> modules/grp_target.py:
+  fix for .DIGESTS.DIGESTS issue in grp
 
   14 Feb 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:
diff --git a/modules/grp_target.py b/modules/grp_target.py
index b0300da1..5141aedd 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.23 2006/01/29 14:42:17 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.24 2006/02/14 15:38:12 rocket Exp $
 
 """
 The builder class for GRP (Gentoo Reference Platform) builds.
@@ -81,35 +81,35 @@ class grp_target(generic_stage_target):
 	
 	def generate_digests(self):
 		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):
-				os.remove(i)
-			
-			files=os.listdir(destdir)
-			#ignore files starting with '.' using list comprehension
-			files=[filename for filename in files if filename[0] != '.']
-			for i in files:
-			    if os.path.isfile(normpath(destdir+"/"+i)):
-				self.gen_digest_file(normpath(destdir+"/"+i))
-		    else:
-			destdir=normpath(self.settings["target_path"]+"/"+pkgset)
-			print "Digesting files in the srcset....."			
+			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):
+						os.remove(i)
+
+				files=os.listdir(destdir)
+				#ignore files starting with '.' using list comprehension
+				files=[filename for filename in files if filename[0] != '.']
+				for i in files:
+					if os.path.isfile(normpath(destdir+"/"+i)):
+						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:
-			    if os.path.exists(i):
-				os.remove(i)
+				digests=glob.glob(destdir+'/*.DIGESTS')
+				for i in digests:
+					if os.path.exists(i):
+						os.remove(i)
 
-			files=os.listdir(destdir)
-			#ignore files starting with '.' using list comprehension
-			files=[filename for filename in files if filename[0] != '.']
-			for i in files:
-			    if os.path.isfile(normpath(destdir+"/"+i)):
-				self.gen_digest_file(normpath(destdir+"/"+i))
+				files=os.listdir(destdir)
+				#ignore files starting with '.' using list comprehension
+				files=[filename for filename in files if filename[0] != '.']
+				for i in files:
+					if os.path.isfile(normpath(destdir+"/"+i)):
+						self.gen_digest_file(normpath(destdir+"/"+i))
 
 		    
 	def set_action_sequence(self):