[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2e044de

The following commit has been merged in the master branch:
commit 2e044de7df398c78f4f8931b456b4a38659cb9e1
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Oct 2 18:23:49 2016 +0000

    #1230 Buildserver maintenance.  Replaced categorize.sh (25 minutes) with categorize.py (0.6 second)
---
 contrib/buildserver/categorize.py | 75 +++++++++++++++++++--------------------
 contrib/buildserver/dailyBuild.sh |  2 +-
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/contrib/buildserver/categorize.py b/contrib/buildserver/categorize.py
index ca7e58f..6796b71 100755
--- a/contrib/buildserver/categorize.py
+++ b/contrib/buildserver/categorize.py
@@ -7,20 +7,20 @@
 
 import os
 import sys
+import shutil
 
 ##
 #
 def mkdir(P):
-	print('mkdir - ',P);
 	if not os.path.exists(P):
-		print('mkdir P')
-		os.path.mkdir(P)
+		os.makedirs(P)
 ##
 
 ##
 #
 def remake(P):
-	os.unlink(P)
+	if os.path.exists(P):
+		shutil.rmtree(P,ignore_errors=True)
 	mkdir(P)
 ##
 	
@@ -35,24 +35,24 @@ def visitfile(file,path,myData):
 	if not os.path.islink(path):
 		try:
 			platform = file.index('-')
-			svn      = file.index('-svn-')
-			date     = file.index('-date-')
-			tar      = file.index('.tar.gz')
-			platform = file[     0:platform]
-			svn      = file[ svn+5:date]
-			date     = file[date+6:tar]
+			svn		 = file.index('-svn-')
+			date	 = file.index('-date-')
+			plus	 = file.index('+')
+			platform = file[	 0:platform]
+			svn		 = file[ svn+5:date]
+			date	 = file[date+6:plus]
 			# print( "%s -> %s %s %s " % (filen , platform,svn,date) )
-			
+
 			myData ['platform'].add(platform)
-			myData ['date'    ].add(date    )
-			myData ['svn'     ].add(svn     )
-			
+			myData ['date'	  ].add(date	)
+			myData ['svn'	  ].add(svn		)
+
 			if sweep==1:
 				Platform = os.path.join(home,'Platform')
-				Date     = os.path.join(home,'Date'    )
-				SVN      = os.path.join(home,'SVN'     )
-				Latest   = os.path.join(home,'Latest'  )
-				
+				Date	 = os.path.join(home,'Date'	   )
+				SVN		 = os.path.join(home,'SVN'	   )
+				Latest	 = os.path.join(home,'Latest'  )
+
 				P=os.path.join(Platform,platform)
 				mkdir(P)
 				os.symlink(path,os.path.join(P,file))
@@ -77,24 +77,24 @@ def visitfile(file,path,myData):
 def searcher(home):
 	"""searcher - walk the tree"""
 	print("home = " , home)
-	
+
 	# recursive search
 	myData = {}
-	myData ['home'    ]=os.path.abspath(home)
+	myData ['home'	  ]=os.path.abspath(home)
 	myData ['platform']=set()
-	myData ['svn'     ]=set()
-	myData ['date'    ]=set()
-	
-	for sweep in range(0,2+1):
+	myData ['svn'	  ]=set()
+	myData ['date'	  ]=set()
+
+	for sweep in range(0,1+1):
 		# sweep == 0 : ignore links and populate myData
 		# sweep == 1 : create the new links
-		myData ['sweep'   ]=sweep
-	
+		myData ['sweep'	  ]=sweep
+
 		for dir, subdirs, files in os.walk(home):
 			for file in files:
 				path = os.path.join(dir, file)
 				visitfile(file,path,myData)
-	
+
 		platform = list(myData ['platform'])
 		platform.sort()
 		# print(platform)
@@ -106,35 +106,34 @@ def searcher(home):
 		svn = list(myData ['svn'])
 		svn.sort()
 		# print(svn)
-	
+
 		myData['latest_svn' ]= svn[len(svn )-1]
 		myData['latest_date']=date[len(date)-1]
-		
+
 		if sweep==0:
 			Platform = os.path.join(home,'Platform')
-			Date     = os.path.join(home,'Date'    )
-			SVN      = os.path.join(home,'SVN'     )
-			Latest   = os.path.join(home,'Latest'  )
-			
+			Date	 = os.path.join(home,'Date'	   )
+			SVN		 = os.path.join(home,'SVN'	   )
+			Latest	 = os.path.join(home,'Latest'  )
+
 			remake(Platform)
 			remake(Date)
 			remake(SVN)
 			remake(Latest)
 
-	
+
 	# print("Latest: ",myData['latest_svn' ],myData['latest_date' ])
 
-	# print(myData ['date'    ])
-	# print(myData ['svn'     ])
+	# print(myData ['date'	  ])
+	# print(myData ['svn'	  ])
 ##
 
-
 ##
 #
 def main(argv):
 	"""main - main program of course"""
 
-	argc	 = len(argv)
+	argc = len(argv)
 	if argc < 2:
 		syntax()
 		return
diff --git a/contrib/buildserver/dailyBuild.sh b/contrib/buildserver/dailyBuild.sh
index ff97795..39ba2c6 100755
--- a/contrib/buildserver/dailyBuild.sh
+++ b/contrib/buildserver/dailyBuild.sh
@@ -31,7 +31,7 @@ ssh rmills at rmillsmm-w7       'cd ~/gnu/exiv2/buildserver ; env PLATFORM=mingw wi
 
 ##
 # categorize the builds
-ssh rmills at rmillsmm         'cd ~/gnu/exiv2/buildserver ; contrib/buildserver/categorize.sh /mmHD/Users/Shared/Jenkins/Home/userContent/builds'
+ssh rmills at rmillsmm         'cd ~/gnu/exiv2/buildserver ; contrib/buildserver/categorize.py /mmHD/Users/Shared/Jenkins/Home/userContent/builds'
 
 # That's all Folks!
 ##

-- 
exiv2 packaging