From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 24 Feb 2008 09:34:00 +0000 (-0000)
Subject:    Merged from trunk 9376:9377
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a510d08c962eb1d99ebddfe386aeed830bc10360;p=portage.git

   Merged from trunk 9376:9377

   | 9377      | Various repoman fixes, plus a weird lockfile tracekback in |
   | WarnerBro | news.                                                      |

svn path=/main/branches/prefix/; revision=9379
---

diff --git a/bin/repoman b/bin/repoman
index 43b118d4f..2a0638fa2 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -9,6 +9,7 @@
 
 import commands
 import codecs
+import commands
 import errno
 import formatter
 import logging
@@ -21,7 +22,6 @@ import sys
 import tempfile
 import time
 
-from commands import getstatusoutput
 from itertools import izip
 from stat import S_ISDIR, ST_CTIME
 
@@ -1037,7 +1037,7 @@ for x in scanlist:
 		if xmllint_capable:
 			# xmlint can produce garbage output even on success, so only dump
 			# the ouput when it fails.
-			st, out = getstatusoutput(
+			st, out = commands.getstatusoutput(
 				"xmllint --nonet --noout --dtdvalid '%s' '%s'" % \
 				 (metadata_dtd, os.path.join(checkdir, "metadata.xml")))
 			if st != os.EX_OK:
@@ -1682,7 +1682,7 @@ else:
 	for myfile in myupdates:
 		if myfile in bin_blobs:
 			continue
-		myout=getstatusoutput("egrep -q "+headerstring+" "+myfile)
+		myout = commands.getstatusoutput("egrep -q "+headerstring+" "+myfile)
 		if myout[0]==0:
 			myheaders.append(myfile)
 
diff --git a/pym/portage/news.py b/pym/portage/news.py
index da7e159af..fe78c6d45 100644
--- a/pym/portage/news.py
+++ b/pym/portage/news.py
@@ -105,7 +105,8 @@ class NewsManager(object):
 				skiplist.append(item.name)
 			unread_file.close()
 		finally:
-			unlockfile(unread_lock)
+			if unread_lock:
+				unlockfile(unread_lock)
 			write_atomic(skipfile, "\n".join(skiplist)+"\n")
 		try:
 			apply_permissions(filename=skipfile, 
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index b9553fbfb..28df593cf 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -132,7 +132,7 @@ def FindPackagesToScan(settings, startdir, reposplit):
 			p = os.path.join(path, d)
 
 			if os.path.isdir(p):
-				cat_pkg_dir = os.path.join(p.split(os.path.sep)[-2:])
+				cat_pkg_dir = os.path.join(*p.split(os.path.sep)[-2:])
 				logging.debug('adding %s to scanlist' % cat_pkg_dir)
 				ret.append(cat_pkg_dir)
 		return ret
@@ -161,7 +161,9 @@ def FindPackagesToScan(settings, startdir, reposplit):
 			logging.warn('%s is not a valid category according to profiles/categories, ' \
 			'skipping checks in %s' % (catdir, catdir))
 		else:
-			scanlist.append(os.path.join(catdir, pkgdir))
+			path = os.path.join(catdir, pkgdir)
+			logging.debug('adding %s to scanlist' % path)
+			scanlist.append(path)
 	return scanlist