From a9a8a9d89da1ce7da093e4d9eb18ca409054267e Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 29 Jan 2010 20:43:56 +0000 Subject: [PATCH] Merged from trunk -r15218:15272 | 15220 | Show the path of the lockfile when chown fails. Thanks to | | zmedico | Jeremy Olexa for reporting. | | 15221 | Enable EAPI 3 and deprecate EAPI 3_pre2. | | zmedico | | | 15222 | Remove code for svn.IO_error and bzr.IO_error categories | | zmedico | since they don't exist therefore and if this code had ever | | | executed it would have raised a KeyError. | | 15272 | Don't ignore CVS/Entries.IO_error when not in commit mode. | | zmedico | | svn path=/main/branches/prefix/; revision=15274 --- bin/repoman | 15 +++++---------- doc/package/ebuild/eapi/3.docbook | 20 ++++++++++---------- pym/portage/__init__.py | 4 ++-- pym/portage/const.py | 2 +- pym/portage/locks.py | 4 ++-- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/bin/repoman b/bin/repoman index 3a97c2b6f..54b466348 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1157,16 +1157,11 @@ for x in scanlist: if l[-7:] == ".ebuild": eadded.append(os.path.basename(l[:-7])) except IOError: - if options.mode == 'commit': - if vcs == "cvs": - stats["CVS/Entries.IO_error"] += 1 - fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries") - elif vcs == "svn": - stats["svn.IO_error"] += 1 - fails["svn.IO_error"].append(checkdir) - elif vcs == "bzr": - stats["bzr.IO_error"] += 1 - fails["bzr.IO_error"].append(checkdir) + if vcs == "cvs": + stats["CVS/Entries.IO_error"] += 1 + fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries") + else: + raise continue mf = Manifest(checkdir, repoman_settings["DISTDIR"]) diff --git a/doc/package/ebuild/eapi/3.docbook b/doc/package/ebuild/eapi/3.docbook index 4665b0955..3e8c85ae5 100644 --- a/doc/package/ebuild/eapi/3.docbook +++ b/doc/package/ebuild/eapi/3.docbook @@ -1,10 +1,10 @@ -
-EAPI 3_pre2 -
+
+EAPI 3 +
Helpers -
+
unpack -
+
Support for the xz file extension The unpack helper now supports the xz file extension. @@ -12,15 +12,15 @@ The unpack helper now supports the xz file extension.
-
+
Support for installation prefix -
+
Helpers Beginning with EAPI 3, all helpers use ${ED} instead of ${D} when appropriate. For example, see econf and einstall below. -
+
econf ${ECONF_SOURCE:-.}/configure \ @@ -37,7 +37,7 @@ ${ECONF_SOURCE:-.}/configure \ configure options || die "econf failed"
-
+
einstall Note that, for make-based packages, 'emake install DESTDIR=${D}' (with @@ -57,7 +57,7 @@ make \
-
+
Variables Installation Prefix Variables diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1638f5e99..b084cf806 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6089,8 +6089,8 @@ def _spawn_misc_sh(mysettings, commands, phase=None, **kwargs): return rval -_testing_eapis = frozenset(["3_pre2"]) -_deprecated_eapis = frozenset(["3_pre1", "2_pre3", "2_pre2", "2_pre1"]) +_testing_eapis = frozenset() +_deprecated_eapis = frozenset(["3_pre2", "3_pre1", "2_pre3", "2_pre2", "2_pre1"]) def _eapi_is_deprecated(eapi): return eapi in _deprecated_eapis diff --git a/pym/portage/const.py b/pym/portage/const.py index 2fada4124..a3c25d6df 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -95,7 +95,7 @@ EBUILD_PHASES = ["setup", "unpack", "prepare", "configure", "package", "preinst", "postinst","prerm", "postrm", "nofetch", "config", "info", "other"] -EAPI = 2 +EAPI = 3 HASHING_BLOCKSIZE = 32768 MANIFEST1_HASH_FUNCTIONS = ["MD5", "SHA256", "RMD160"] diff --git a/pym/portage/locks.py b/pym/portage/locks.py index cdbbf03c3..f024fe542 100644 --- a/pym/portage/locks.py +++ b/pym/portage/locks.py @@ -89,8 +89,8 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, unlinkfile=unlinkfile, waiting_msg=waiting_msg, flags=flags) else: - writemsg(_("Cannot chown a lockfile. This could " - "cause inconvenience later.\n")) + writemsg(_("Cannot chown a lockfile: '%s'\n") % \ + lockfilename, noiselevel=-1) finally: os.umask(old_mask) -- 2.26.2