pld-ftp-admin: wwwbin/ftp-freshness.py - version for git setup

[draenog]

Author: draenog                      Date: Tue Aug 21 16:05:29 2012 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- version for git setup

---- Files affected:
pld-ftp-admin/wwwbin:
   ftp-freshness.py (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: pld-ftp-admin/wwwbin/ftp-freshness.py
diff -u pld-ftp-admin/wwwbin/ftp-freshness.py:1.1 pld-ftp-admin/wwwbin/ftp-freshness.py:1.2
--- pld-ftp-admin/wwwbin/ftp-freshness.py:1.1	Fri May  4 08:09:41 2012
+++ pld-ftp-admin/wwwbin/ftp-freshness.py	Tue Aug 21 18:05:24 2012
@@ -12,33 +12,18 @@
 		 "/home/ftp/pub/Linux/PLD/dists/th/ready/SRPMS/RPMS/",
 		 "/home/ftp/pub/Linux/PLD/dists/th/PLD/SRPMS/RPMS/" ]
 #dirs = [ "/home/pld/admins/th/1" ]
-cvsdir = "/home/pld/admins/th/"
+specsdir = "/home/pld/admins/th/SPECS"
+
+if os.path.isdir(specsdir):
+    cmd = ['git', 'pull']
+else:
+    cmd = ['git', 'clone', '--depth=1', 'git://git.pld-linux.org/SPECS', specsdir]
 
-cmd = ['cvs', '-Q', '-z3', '-d:pserver:cvs at cvs.pld-linux.org:/cvsroot', 'ls', '-l', 'packages']
 p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 (out, err) = p.communicate(None)
-re_dir = re.compile('^(.*)\s+\(directory\)')
-packages = []
-i = 0
-j = 0
-for line in out.split('\n'):
-	m = re_dir.match(line)
-	if not m:
-		continue
-	if j == 0:
-		packages.append([])
-	spec = m.group(1).strip()
-	packages[i].append('packages/' + spec + '/' + spec + '.spec')
-	j = j + 1
-	if j > 100:
-		i = i + 1
-		j = 0
-
-os.chdir(cvsdir)
-for p in packages:
-	cmd = ['cvs', '-Q', '-z3', '-d:pserver:cvs at cvs.pld-linux.org:/cvsroot', 'co'] + p
-	ret = subprocess.call(cmd)
 
+
+os.chdir(specsdir)
 class Pkgs(object):
 	def __init__(self):
 		self.pkg = {}
@@ -57,7 +42,7 @@
 		return (name, version, release)
 
 	def __get_from_cvs(self, name):
-		f = os.popen('rpm --specfile -q --queryformat "%{name}\n%{version}\n%{release}\n" ' + cvsdir + '/packages/' + name + '/' + name + '.spec 2> /dev/null', 'r')
+		f = os.popen('rpm --specfile -q --queryformat "%{name}\n%{version}\n%{release}\n" ' + specsdir + '/' + name + '.spec 2> /dev/null', 'r')
 		name = f.readline().strip()
 		version = f.readline().strip()
 		release = f.readline().strip()
@@ -113,7 +98,7 @@
 			self.cvs_new_nvr.sort()
 			cvs_nvr = self.cvs[name]
 			pkg_nvr = self.pkg[name]
-			print "CVS: %s %s-%s-%s vs FTP: %s-%s-%s" % (name, cvs_nvr[0], cvs_nvr[1], cvs_nvr[2], pkg_nvr[0], pkg_nvr[1], pkg_nvr[2])
+			print "GIT: %s %s-%s-%s vs FTP: %s-%s-%s" % (name, cvs_nvr[0], cvs_nvr[1], cvs_nvr[2], pkg_nvr[0], pkg_nvr[1], pkg_nvr[2])
 
 	def print_nv(self):
 		print "*** VERSION COMPARE ONLY ***"
@@ -121,7 +106,7 @@
 		for name in self.cvs_new_nv:
 			cvs_nvr = self.cvs[name]
 			pkg_nvr = self.pkg[name]
-			print "CVS: %s %s-%s-%s vs FTP: %s-%s-%s" % (name, cvs_nvr[0], cvs_nvr[1], cvs_nvr[2], pkg_nvr[0], pkg_nvr[1], pkg_nvr[2])
+			print "GIT: %s %s-%s-%s vs FTP: %s-%s-%s" % (name, cvs_nvr[0], cvs_nvr[1], cvs_nvr[2], pkg_nvr[0], pkg_nvr[1], pkg_nvr[2])
 
 p = Pkgs()
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/wwwbin/ftp-freshness.py?r1=1.1&r2=1.2