Switch gentoo-portage checking to PortageCheck

1 files changed, 3 insertions, 30 deletions

diff --git a/gard-v2.py b/gard-v2.py
index 6ea0a93..a811cd3 100755
--- a/gard-v2.py
+++ b/gard-v2.py
@@ -89,36 +89,7 @@ for line in file:
 			handler = add_handler(fname)
 			info4=grsync+" wants to be a gentoo-portage mirror and is being checked as per Bug #"+bugnum
 			logging.info(info4)
-			target=grsync+"::gentoo-portage/metadata/timestamp.chk"
-			retcode=subprocess.call(['rsync','-aqP','--no-motd','--contimeout=30',target,'.'])
-			if retcode > 0:
-				logging.error("return value of rsync during gentoo-portage check was "+str(retcode))
-			else:	
-				temp=open('timestamp.chk','r')
-				ots=temp.readline()
-				temp.close()
-				#Keep timestamp as Fri, 04 Jul 2008 20:45:01, remove the +0000 since there doesn't seem to be a %z in python
-				t1=time.mktime(time.strptime(ots.replace(" +0000",""), "%a, %d %b %Y %H:%M:%S "))
-				lag=(time.mktime(time.gmtime())-t1)/60
-				if lag > rmaxlag:
-					error4 = "gentoo-portage mirror is lagging by over 40 mins, lag is : "+str(round(lag,2))+" mins"
-					tstamp4 = "Timestamp on Mirror   : "+str(ots).strip()
-					curtime4 = "Current time in UTC   : "+str(time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()))
-					bugurl4 = "Bug URL : https://bugs.gentoo.org/"+bugnum+" , "+duedate
-					logging.error(error4)
-					logging.info(tstamp4)
-					logging.info(curtime4)
-					logging.info(bugurl4)
-				else:
-					info4 = grsync+" is in sync, current delta : "+str(round(lag,2))+" mins"
-					tstamp4 = "Timestamp on Mirror   : "+str(ots)
-					curtime4= "Current time in UTC   : "+str(time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()))
-					bugurl4 = "Bug URL : https://bugs.gentoo.org/"+bugnum+" , "+duedate
-					logging.info(info4)
-					logging.info(tstamp4)
-					logging.info(curtime4)
-					logging.info(bugurl4)
-				os.unlink('timestamp.chk')
+			check.PortageCheck(addy).check(rmaxlag)
 			# New line for the prettiness
 			logging.info('')
 			remove_handler(handler)
@@ -175,6 +146,8 @@ for line in file:
 			logging.info('')
 			remove_handler(handler)
 		if len(drsync) > 0:
+			# Replace with check.DistfilesCheck(drsyync).check()
+			# after testing
 			fname=reportpath+"/"+addy
 			if os.path.isdir(reportpath):
 	       			pass