Add rsync URL support to DistfilesCheck, and some minor changes

1 files changed, 17 insertions, 10 deletions

diff --git a/check.py b/check.py
index 3695f91..4ec769a 100644
--- a/check.py
+++ b/check.py
@@ -39,16 +39,21 @@ class GardCheck:
 		return ret
 
 	# Gets a file over rsync and puts it in a temporary directory,
-	# if specified
+	# if specified (assumes URL is the form rsync://server/module
+	# and takes path relative to this)
 	def get_file_rsync(self, path, dir='.'):
-		target = '%s::%s' % (self.url, path)
-
+		urlp = urlparse.urlparse(self.url)
+		if len(urlp.path) > 1:
+			# strip leading '/' from URL path
+			path = urlp.path[1:] + '/' + path
+		target = '%s::%s' % (urlp.netloc, path)
 		retcode = subprocess.call(['rsync', '-aqP', '--no-motd', 
 					'--contimeout=30', target, dir])
 		if retcode > 0:
-			logging.error('return value of rsync during \
-				gentoo-portage check was ' + str(retcode))
-			return None
+			logging.error('rsync returned %d during gentoo-portage check' % retcode)
+			return False
+
+		return True
 
 	# Takes the URL to a timestamp.{chk|x} file and returns the
 	# corresponding time stamp in seconds
@@ -117,12 +122,12 @@ class DistfilesCheck(GardCheck):
 		if scheme == 'http' or scheme == 'ftp':
 			path = '/distfiles/timestamp.chk'
 			lag = self.get_lag(self.url + path)
-		else:
-			# XXX: to be tested!
+		elif scheme == 'rsync':
 			file = 'timestamp.x'
 			path = 'distfiles/' + file
 
-			self.get_file_rsync(path)
+			if self.get_file_rsync(path) is False:
+				return None
 
 			url = 'file://%s/%s' % (os.path.abspath(''), file)
 			lag = self.get_lag(url)
@@ -164,11 +169,13 @@ class ReleasesCheck(GardCheck):
 		return ret
 
 class PortageCheck(GardCheck):
+	# Takes a URL in rsync://host/module/path form
 	def lag(self):
 		file = 'timestamp.chk'
 		path = 'gentoo-portage/metadata/' + file
 
-		self.get_file_rsync(path)
+		if self.get_file_rsync(path) is False:
+			return None
 
 		# This is Linux-specific, but who's going to run this on
 		# Windows anyway? :D