diff options
-rw-r--r-- | pym/portage/dbapi/vartree.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index cca5ca9a3..45badc3e3 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1672,16 +1672,20 @@ class dblink(object): return 1 inforoot_slot_file = os.path.join(inforoot, "SLOT") + slot = None try: f = open(inforoot_slot_file) try: slot = f.read().strip() finally: f.close() - except OSError, e: - writemsg("!!! Error reading '%s': %s\n" % (inforoot_slot_file, e), - noiselevel=-1) - return 1 + except EnvironmentError, e: + if e.errno != errno.ENOENT: + raise + del e + + if slot is None: + slot = "" if slot != self.settings["SLOT"]: writemsg("!!! WARNING: Expected SLOT='%s', got '%s'\n" % \ |