diff options
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/news.py | 3 | ||||
| -rw-r--r-- | pym/repoman/utilities.py | 6 |
2 files changed, 6 insertions, 3 deletions
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 3cefff5ec..7666ba5d6 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -123,7 +123,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 @@ -152,7 +152,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 |