diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-20 12:26:48 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-20 12:26:48 -0800 |
| commit | 3c36110f7c30fe866764dd1d20a65a273e0ecc6e (patch) | |
| tree | 93e17cf36a68c48b2e977da29d89a9d7b5d043f5 | |
| parent | 287a6a91b3736b5cf732f848efcafa8014413b1a (diff) | |
| download | portage-3c36110f7c30fe866764dd1d20a65a273e0ecc6e.tar.gz portage-3c36110f7c30fe866764dd1d20a65a273e0ecc6e.tar.bz2 portage-3c36110f7c30fe866764dd1d20a65a273e0ecc6e.zip | |
Silently allow missing /var/cache/edb/counter.
Files under /var/cache/ are allowed to disappear.
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a9a147a98..6e718484c 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -772,8 +772,7 @@ class vardbapi(dbapi): @param myroot: ignored, self._eroot is used instead """ - myroot = None - new_vdb = False + del myroot counter = -1 try: cfile = io.open( @@ -782,8 +781,9 @@ class vardbapi(dbapi): mode='r', encoding=_encodings['repo.content'], errors='replace') except EnvironmentError as e: - new_vdb = not bool(self.cpv_all()) - if not new_vdb: + # Silently allow ENOENT since files under + # /var/cache/ are allowed to disappear. + if e.errno != errno.ENOENT: writemsg(_("!!! Unable to read COUNTER file: '%s'\n") % \ self._counter_path, noiselevel=-1) writemsg("!!! %s\n" % str(e), noiselevel=-1) @@ -820,10 +820,6 @@ class vardbapi(dbapi): if pkg_counter > max_counter: max_counter = pkg_counter - if counter < 0 and not new_vdb: - writemsg(_("!!! Initializing COUNTER to " \ - "value of %d\n") % max_counter, noiselevel=-1) - return max_counter + 1 def counter_tick_core(self, myroot=None, incrementing=1, mycpv=None): |