If there are packages to be merged or unmerge, then bail out early if /var/db/pkg is not writable.
X-Gentoo-Bug: 490732 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=490732 --- pym/_emerge/actions.py | 21 +++++++++++++++++++++ pym/portage/dbapi/vartree.py | 9 +++++++++ 2 files changed, 30 insertions(+) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 48b0826..4a96a22 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -428,6 +428,21 @@ def action_build(settings, trees, mtimedb, # least show warnings about missed updates and such. mydepgraph.display_problems() + if not Scheduler._opts_no_self_update.intersection(myopts): + + eroots = set() + for x in mydepgraph.altlist(): + if isinstance(x, Package) and x.operation == "merge": + eroots.add(x.root) + + for eroot in eroots: + if not trees[eroot]["vartree"].dbapi.writable: + writemsg_level("!!! %s\n" % + _("Read-only file system: %s") % + trees[eroot]["vartree"].dbapi._dbroot, + level=logging.ERROR, noiselevel=-1) + return 1 + if ("--resume" in myopts): favorites=mtimedb["resume"]["favorites"] @@ -2842,6 +2857,12 @@ def action_uninstall(settings, trees, ldpath_mtimes, if action == 'deselect': return action_deselect(settings, trees, opts, valid_atoms) + if not vardb.writable: + writemsg_level("!!! %s\n" % + _("Read-only file system: %s") % vardb._dbroot, + level=logging.ERROR, noiselevel=-1) + return 1 + # Use the same logic as the Scheduler class to trigger redirection # of ebuild pkg_prerm/postrm phase output to logs as appropriate # for options such as --jobs, --quiet and --quiet-build. diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0fd1bd9..64b0ff6 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -33,6 +33,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.util.env_update:env_update', 'portage.util.listdir:dircache,listdir', 'portage.util.movefile:movefile', + 'portage.util.path:first_existing', 'portage.util.writeable_check:get_ro_checker', 'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry', 'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap', @@ -189,6 +190,14 @@ class vardbapi(dbapi): self._cached_counter = None @property + def writable(self): + """ + @rtype: bool + @return: True if var/db/pkg is writable, False otherwise + """ + return os.access(first_existing(self._dbroot), os.W_OK) + + @property def root(self): warnings.warn("The root attribute of " "portage.dbapi.vartree.vardbapi" -- 2.0.4
