* [gentoo-commits] portage r9379 - in main/branches/prefix: bin pym/portage pym/repoman
@ 2008-02-24 9:34 Fabian Groffen (grobian)
0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2008-02-24 9:34 UTC (permalink / raw
To: gentoo-commits
Author: grobian
Date: 2008-02-24 09:34:00 +0000 (Sun, 24 Feb 2008)
New Revision: 9379
Modified:
main/branches/prefix/bin/repoman
main/branches/prefix/pym/portage/news.py
main/branches/prefix/pym/repoman/utilities.py
Log:
Merged from trunk 9376:9377
| 9377 | Various repoman fixes, plus a weird lockfile tracekback in |
| WarnerBro | news. |
Modified: main/branches/prefix/bin/repoman
===================================================================
--- main/branches/prefix/bin/repoman 2008-02-24 09:31:23 UTC (rev 9378)
+++ main/branches/prefix/bin/repoman 2008-02-24 09:34:00 UTC (rev 9379)
@@ -9,6 +9,7 @@
import commands
import codecs
+import commands
import errno
import formatter
import logging
@@ -21,7 +22,6 @@
import tempfile
import time
-from commands import getstatusoutput
from itertools import izip
from stat import S_ISDIR, ST_CTIME
@@ -1037,7 +1037,7 @@
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 @@
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)
Modified: main/branches/prefix/pym/portage/news.py
===================================================================
--- main/branches/prefix/pym/portage/news.py 2008-02-24 09:31:23 UTC (rev 9378)
+++ main/branches/prefix/pym/portage/news.py 2008-02-24 09:34:00 UTC (rev 9379)
@@ -105,7 +105,8 @@
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,
Modified: main/branches/prefix/pym/repoman/utilities.py
===================================================================
--- main/branches/prefix/pym/repoman/utilities.py 2008-02-24 09:31:23 UTC (rev 9378)
+++ main/branches/prefix/pym/repoman/utilities.py 2008-02-24 09:34:00 UTC (rev 9379)
@@ -132,7 +132,7 @@
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 @@
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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-02-24 9:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-24 9:34 [gentoo-commits] portage r9379 - in main/branches/prefix: bin pym/portage pym/repoman Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox