Merged from trunk -r15218:15272

   | 15220   | Show the path of the lockfile when chown fails. Thanks to    |
   | zmedico | Jeremy Olexa <darkside@g.o> 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

diff --git a/bin/repoman b/bin/repoman
index 3a97c2b6f9b6bd85125a92278ff8c7c711656ef3..54b466348d67adc16815576ec41c16c722f321e5 100755 (executable)
--- 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 4665b095590aabe75b22bc2384e0250dd05a1940..3e8c85ae50906871363277a2dbfa8ec0521fa926 100644 (file)
--- a/doc/package/ebuild/eapi/3.docbook
+++ b/doc/package/ebuild/eapi/3.docbook
@@ -1,10 +1,10 @@
-<section id='package-ebuild-eapi-3_pre2'>
-<title>EAPI 3_pre2</title>
-<section id='package-ebuild-eapi-3_pre2-helpers'>
+<section id='package-ebuild-eapi-3'>
+<title>EAPI 3</title>
+<section id='package-ebuild-eapi-3-helpers'>
 <title>Helpers</title>
-<section id='package-ebuild-eapi-3_pre2-helpers-unpack'>
+<section id='package-ebuild-eapi-3-helpers-unpack'>
 <title>unpack</title>
-<section id='package-ebuild-eapi-3_pre2-helpers-unpack-xz'>
+<section id='package-ebuild-eapi-3-helpers-unpack-xz'>
 <title>Support for the xz file extension</title>
 <para>
 The unpack helper now supports the xz file extension.
@@ -12,15 +12,15 @@ The unpack helper now supports the xz file extension.
 </section>
 </section>
 </section>
-<section id='package-ebuild-eapi-3_pre2-prefix'>
+<section id='package-ebuild-eapi-3-prefix'>
 <title>Support for installation prefix</title>
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers'>
+<section id='package-ebuild-eapi-3-prefix-helpers'>
 <title>Helpers</title>
 <para>
 Beginning with EAPI 3, all helpers use ${ED} instead of ${D}
 when appropriate. For example, see econf and einstall below.
 </para>
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers-econf'>
+<section id='package-ebuild-eapi-3-prefix-helpers-econf'>
 <title>econf</title>
 <programlisting>
 ${ECONF_SOURCE:-.}/configure \
@@ -37,7 +37,7 @@ ${ECONF_SOURCE:-.}/configure \
        configure options || die "econf failed"
 </programlisting>
 </section>
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers-einstall'>
+<section id='package-ebuild-eapi-3-prefix-helpers-einstall'>
 <title>einstall</title>
 <para>
 Note that, for make-based packages, 'emake install DESTDIR=${D}' (with
@@ -57,7 +57,7 @@ make \
 </programlisting>
 </section>
 </section>
-<section id='package-ebuild-eapi-3_pre2-prefix-variables'>
+<section id='package-ebuild-eapi-3-prefix-variables'>
 <title>Variables</title>
 <table><title>Installation Prefix Variables</title>
        <tgroup cols='2' align='left' >

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1638f5e9966ee709eef5545f0e33956c2c36ecc0..b084cf8064a891be4f971de14eb67be077477bac 100644 (file)
--- 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 2fada41246ffc8c57a50d7c821220c102aaf1c71..a3c25d6df3ae81b66de14f7b6da7b2132748a2e7 100644 (file)
--- 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 cdbbf03c3b87418bbc7488098002372e483e5b1d..f024fe5420b0f93b1b6c5db6d81c370aace476fd 100644 (file)
--- 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)