| 1 |
Author: grobian |
| 2 |
Date: 2008-02-24 09:34:00 +0000 (Sun, 24 Feb 2008) |
| 3 |
New Revision: 9379 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
main/branches/prefix/pym/portage/news.py |
| 8 |
main/branches/prefix/pym/repoman/utilities.py |
| 9 |
Log: |
| 10 |
Merged from trunk 9376:9377 |
| 11 |
|
| 12 |
| 9377 | Various repoman fixes, plus a weird lockfile tracekback in | |
| 13 |
| WarnerBro | news. | |
| 14 |
|
| 15 |
|
| 16 |
Modified: main/branches/prefix/bin/repoman |
| 17 |
=================================================================== |
| 18 |
--- main/branches/prefix/bin/repoman 2008-02-24 09:31:23 UTC (rev 9378) |
| 19 |
+++ main/branches/prefix/bin/repoman 2008-02-24 09:34:00 UTC (rev 9379) |
| 20 |
@@ -9,6 +9,7 @@ |
| 21 |
|
| 22 |
import commands |
| 23 |
import codecs |
| 24 |
+import commands |
| 25 |
import errno |
| 26 |
import formatter |
| 27 |
import logging |
| 28 |
@@ -21,7 +22,6 @@ |
| 29 |
import tempfile |
| 30 |
import time |
| 31 |
|
| 32 |
-from commands import getstatusoutput |
| 33 |
from itertools import izip |
| 34 |
from stat import S_ISDIR, ST_CTIME |
| 35 |
|
| 36 |
@@ -1037,7 +1037,7 @@ |
| 37 |
if xmllint_capable: |
| 38 |
# xmlint can produce garbage output even on success, so only dump |
| 39 |
# the ouput when it fails. |
| 40 |
- st, out = getstatusoutput( |
| 41 |
+ st, out = commands.getstatusoutput( |
| 42 |
"xmllint --nonet --noout --dtdvalid '%s' '%s'" % \ |
| 43 |
(metadata_dtd, os.path.join(checkdir, "metadata.xml"))) |
| 44 |
if st != os.EX_OK: |
| 45 |
@@ -1682,7 +1682,7 @@ |
| 46 |
for myfile in myupdates: |
| 47 |
if myfile in bin_blobs: |
| 48 |
continue |
| 49 |
- myout=getstatusoutput("egrep -q "+headerstring+" "+myfile) |
| 50 |
+ myout = commands.getstatusoutput("egrep -q "+headerstring+" "+myfile) |
| 51 |
if myout[0]==0: |
| 52 |
myheaders.append(myfile) |
| 53 |
|
| 54 |
|
| 55 |
Modified: main/branches/prefix/pym/portage/news.py |
| 56 |
=================================================================== |
| 57 |
--- main/branches/prefix/pym/portage/news.py 2008-02-24 09:31:23 UTC (rev 9378) |
| 58 |
+++ main/branches/prefix/pym/portage/news.py 2008-02-24 09:34:00 UTC (rev 9379) |
| 59 |
@@ -105,7 +105,8 @@ |
| 60 |
skiplist.append(item.name) |
| 61 |
unread_file.close() |
| 62 |
finally: |
| 63 |
- unlockfile(unread_lock) |
| 64 |
+ if unread_lock: |
| 65 |
+ unlockfile(unread_lock) |
| 66 |
write_atomic(skipfile, "\n".join(skiplist)+"\n") |
| 67 |
try: |
| 68 |
apply_permissions(filename=skipfile, |
| 69 |
|
| 70 |
Modified: main/branches/prefix/pym/repoman/utilities.py |
| 71 |
=================================================================== |
| 72 |
--- main/branches/prefix/pym/repoman/utilities.py 2008-02-24 09:31:23 UTC (rev 9378) |
| 73 |
+++ main/branches/prefix/pym/repoman/utilities.py 2008-02-24 09:34:00 UTC (rev 9379) |
| 74 |
@@ -132,7 +132,7 @@ |
| 75 |
p = os.path.join(path, d) |
| 76 |
|
| 77 |
if os.path.isdir(p): |
| 78 |
- cat_pkg_dir = os.path.join(p.split(os.path.sep)[-2:]) |
| 79 |
+ cat_pkg_dir = os.path.join(*p.split(os.path.sep)[-2:]) |
| 80 |
logging.debug('adding %s to scanlist' % cat_pkg_dir) |
| 81 |
ret.append(cat_pkg_dir) |
| 82 |
return ret |
| 83 |
@@ -161,7 +161,9 @@ |
| 84 |
logging.warn('%s is not a valid category according to profiles/categories, ' \ |
| 85 |
'skipping checks in %s' % (catdir, catdir)) |
| 86 |
else: |
| 87 |
- scanlist.append(os.path.join(catdir, pkgdir)) |
| 88 |
+ path = os.path.join(catdir, pkgdir) |
| 89 |
+ logging.debug('adding %s to scanlist' % path) |
| 90 |
+ scanlist.append(path) |
| 91 |
return scanlist |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
-- |
| 96 |
gentoo-commits@l.g.o mailing list |
Archives