public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Chris Reffett <creffett@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Subject: [gentoo-portage-dev] [PATCH v2] Test for read-only filesystems, bail out during preinst if there are any which will be written to and display a useful error message. Fixes bug 378869.
Date: Thu, 16 Jan 2014 19:39:04 -0500	[thread overview]
Message-ID: <1389919144-30969-1-git-send-email-creffett@gentoo.org> (raw)
In-Reply-To: <201401131824.07417.vapier@gentoo.org>

v2: Reformat, add a function to return an appropriate read-only checker
for the operating system, so that this can be extended to other OSes.
---
 pym/portage/dbapi/vartree.py  | 32 +++++++++++++++++
 pym/portage/util/rochecker.py | 81 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 pym/portage/util/rochecker.py

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ed62323..c77cf07 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -32,6 +32,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.util.env_update:env_update',
 	'portage.util.listdir:dircache,listdir',
 	'portage.util.movefile:movefile',
+	'portage.util.rochecker:get_ro_checker',
 	'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry',
 	'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap',
 	'portage.util._async.SchedulerInterface:SchedulerInterface',
@@ -3508,6 +3509,8 @@ class dblink(object):
 		
 		This function does the following:
 		
+		calls get_ro_checker to retrieve a function for checking whether Portage
+		will write to a read-only filesystem, then runs it against the directory list
 		calls self._preserve_libs if FEATURES=preserve-libs
 		calls self._collision_protect if FEATURES=collision-protect
 		calls doebuild(mydo=pkg_preinst)
@@ -3685,6 +3688,7 @@ class dblink(object):
 			eagain_error = False
 
 			myfilelist = []
+			mydirlist = []
 			mylinklist = []
 			paths_with_newlines = []
 			def onerror(e):
@@ -3717,6 +3721,9 @@ class dblink(object):
 					unicode_errors.append(new_parent[ed_len:])
 					break
 
+				relative_path = parent[srcroot_len:]
+				mydirlist.append("/" + relative_path)
+
 				for fname in files:
 					try:
 						fname = _unicode_decode(fname,
@@ -3829,6 +3836,31 @@ class dblink(object):
 			for other in others_in_slot])
 		prepare_build_dirs(settings=self.settings, cleanup=cleanup)
 
+		# Check for read-only filesystems
+		ro_checker_func = get_ro_checker()
+		rofilesystems = ro_checker_func(mydirlist)
+
+		if rofilesystems:
+			msg = _("One or more files installed to this package are "
+				"set to be installed to read-only filesystems. "
+				"Please mount the filesystems below read-write "
+				"and retry.")
+			msg = textwrap.wrap(msg, 70)
+			msg.append("")
+			for f in rofilesystems:
+				msg.append("\t%s" % os.path.join(destroot,
+					f.lstrip(os.path.sep)))
+			msg.append("")
+			self._elog("eerror", "preinst", msg)
+
+			msg = _("Package '%s' NOT merged due to read-only file systems.") % \
+				self.settings.mycpv
+			msg += _(" If necessary, refer to your elog "
+				"messages for the whole content of the above message.")
+			msg = textwrap.wrap(msg, 70)
+			eerror(msg)
+			return 1
+
 		# check for package collisions
 		blockers = self._blockers
 		if blockers is None:
diff --git a/pym/portage/util/rochecker.py b/pym/portage/util/rochecker.py
new file mode 100644
index 0000000..67e8131
--- /dev/null
+++ b/pym/portage/util/rochecker.py
@@ -0,0 +1,81 @@
+#-*- coding:utf-8 -*-
+# Copyright 2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+"""
+Methods to check whether Portage is going to write to read-only filesystems.
+Since the methods are not portable across different OSes, each OS needs its
+own method. To expand RO checking for different OSes, add a method which
+accepts a list of directories and returns a list of mounts which need to be
+remounted RW, then add "elif ostype == (the ostype value for your OS)" to
+get_ro_checker()
+"""
+from __future__ import unicode_literals
+
+import logging
+import re
+
+from portage.util import writemsg_level
+from portage.localization import _
+from portage.data import ostype
+
+
+def get_ro_checker():
+	"""
+	Uses the system type to find an appropriate method for testing whether Portage
+	is going to write to any read-only filesystems
+
+	@return:
+	1. A method for testing for RO filesystems appropriate to the current system
+	"""
+	if ostype == "Linux":
+		return linux_ro_checker
+	else:
+		return empty_ro_checker
+
+
+def linux_ro_checker(dir_list):
+	"""
+	Use /proc/mounts to check that no directories installed by the ebuild are set
+	to be installed to a read-only filesystem
+
+	@param dir_list: Directories installed by the ebuild
+	@type dir_list: List
+	@return:
+	1. A list of filesystems which are both set to be written to and are mounted
+	read-only, may be empty.
+	"""
+	ro_filesystems = set()
+	ro_filesystems_written = set()
+
+	try:
+		with open("/proc/mounts") as f:
+			roregex = re.compile(r'(\A|,)ro(\Z|,)')
+			for line in f:
+				if roregex.search(line.split(" ")[3].strip()) is not None:
+					romount = line.split(" ")[1].strip()
+					ro_filesystems.add(romount)
+
+	# If /proc/mounts can't be read, assume that there are no RO
+	# filesystems and return
+	except EnvironmentError:
+		writemsg_level(_("!!! /proc/mounts cannot be read"),
+			level=logging.WARNING, noiselevel=-1)
+		return []
+
+	if not ro_filesystems:
+		return ro_filesystems
+
+	for directory in dir_list:
+		for filesystem in ro_filesystems:
+			if filesystem == directory:
+				ro_filesystems_written.add(filesystem)
+
+	return ro_filesystems_written
+
+
+def empty_ro_checker(dir_list):
+	"""
+	Always returns [], this is the fallback function if the system does not have
+	an ro_checker method defined
+	"""
+	return []
-- 
1.8.5.1



  reply	other threads:[~2014-01-17  0:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-11  3:07 [gentoo-portage-dev] [PATCH] Check for and report read-only filesystems Chris Reffett
2014-01-11  5:09 ` Brian Dolbec
2014-01-11 14:22   ` Chris Reffett
2014-01-13 23:24 ` Mike Frysinger
2014-01-17  0:39   ` Chris Reffett [this message]
2014-01-19  2:00     ` [gentoo-portage-dev] [PATCH v3] Test for read-only filesystems, bail out during preinst if there are any which will be written to and display a useful error message. Fixes bug 378869 Chris Reffett
2014-01-19  9:17       ` Mike Frysinger
2014-01-19 10:39         ` Alexander Berntsen
2014-01-19 21:43           ` Alec Warner
2014-01-21  3:28           ` Mike Frysinger
2014-01-21  3:53             ` Gordon Pettey
2014-01-21 22:44               ` Mike Frysinger
2014-01-21  0:50         ` [gentoo-portage-dev] [PATCH v4] " Chris Reffett
2014-01-21  3:32           ` Mike Frysinger
2014-01-21  4:00             ` [gentoo-portage-dev] [PATCH v5] " Chris Reffett
2014-01-22  5:24               ` Mike Frysinger
2014-01-22 18:33                 ` [gentoo-portage-dev] [PATCH v6] " Chris Reffett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389919144-30969-1-git-send-email-creffett@gentoo.org \
    --to=creffett@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox