[gentoo-commits] portage r14725 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-10-25 20:21:10 +0000 (Sun, 25 Oct 2009)
New Revision: 14725

Modified:
   main/trunk/bin/repoman
Log:
Don't set mtime on downloaded metadata.dtd when using python3, since the
rfc822.parsedate() function is not available. Thanks to Arfrever for
reporting.


Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman	2009-10-24 12:16:59 UTC (rev 14724)
+++ main/trunk/bin/repoman	2009-10-25 20:21:10 UTC (rev 14725)
@@ -25,8 +25,17 @@
 import tempfile
 import time
 import platform
-import urllib
 
+try:
+	from urllib.request import urlopen as urllib_request_urlopen
+except ImportError:
+	from urllib import urlopen as urllib_request_urlopen
+
+try:
+	from rfc822 import parsedate
+except ImportError:
+	parsedate = None
+
 from io import StringIO
 from itertools import chain
 from stat import S_ISDIR, ST_CTIME
@@ -803,10 +812,19 @@
 			"needs to be refetched, doing that now")
 		print()
 		try:
-			url_f = urllib.urlopen(metadata_dtd_uri)
-			last_modified = url_f.info().getdate('last-modified')
-			if last_modified is not None:
-				last_modified = time.mktime(last_modified)
+			url_f = urllib_request_urlopen(metadata_dtd_uri)
+			msg_info = url_f.info()
+			last_modified = msg_info.get('last-modified')
+			# Date parsing isn't supported in python3 since it has no
+			# equivalent of the rfc822.parsedate() function.
+			# TODO: Convert the last-modified field to locale-independent
+			# format and then use time.strptime() to parse it.
+			if parsedate is None:
+				last_modified = None
+			elif last_modified is not None:
+				last_modified = parsedate(last_modified)
+				if last_modified is not None:
+					last_modified = time.mktime(last_modified)
 
 			metadata_dtd_tmp = "%s.%s" % (metadata_dtd, os.getpid())
 			try: