| 1 |
Author: grobian |
| 2 |
Date: 2010-01-29 20:43:56 +0000 (Fri, 29 Jan 2010) |
| 3 |
New Revision: 15274 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
main/branches/prefix/doc/package/ebuild/eapi/3.docbook |
| 8 |
main/branches/prefix/pym/portage/__init__.py |
| 9 |
main/branches/prefix/pym/portage/const.py |
| 10 |
main/branches/prefix/pym/portage/locks.py |
| 11 |
Log: |
| 12 |
Merged from trunk -r15218:15272 |
| 13 |
|
| 14 |
| 15220 | Show the path of the lockfile when chown fails. Thanks to | |
| 15 |
| zmedico | Jeremy Olexa <darkside@g.o> for reporting. | |
| 16 |
|
| 17 |
| 15221 | Enable EAPI 3 and deprecate EAPI 3_pre2. | |
| 18 |
| zmedico | | |
| 19 |
|
| 20 |
| 15222 | Remove code for svn.IO_error and bzr.IO_error categories | |
| 21 |
| zmedico | since they don't exist therefore and if this code had ever | |
| 22 |
| | executed it would have raised a KeyError. | |
| 23 |
|
| 24 |
| 15272 | Don't ignore CVS/Entries.IO_error when not in commit mode. | |
| 25 |
| zmedico | | |
| 26 |
|
| 27 |
|
| 28 |
Modified: main/branches/prefix/bin/repoman |
| 29 |
=================================================================== |
| 30 |
--- main/branches/prefix/bin/repoman 2010-01-29 19:07:56 UTC (rev 15273) |
| 31 |
+++ main/branches/prefix/bin/repoman 2010-01-29 20:43:56 UTC (rev 15274) |
| 32 |
@@ -1157,16 +1157,11 @@ |
| 33 |
if l[-7:] == ".ebuild": |
| 34 |
eadded.append(os.path.basename(l[:-7])) |
| 35 |
except IOError: |
| 36 |
- if options.mode == 'commit': |
| 37 |
- if vcs == "cvs": |
| 38 |
- stats["CVS/Entries.IO_error"] += 1 |
| 39 |
- fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries") |
| 40 |
- elif vcs == "svn": |
| 41 |
- stats["svn.IO_error"] += 1 |
| 42 |
- fails["svn.IO_error"].append(checkdir) |
| 43 |
- elif vcs == "bzr": |
| 44 |
- stats["bzr.IO_error"] += 1 |
| 45 |
- fails["bzr.IO_error"].append(checkdir) |
| 46 |
+ if vcs == "cvs": |
| 47 |
+ stats["CVS/Entries.IO_error"] += 1 |
| 48 |
+ fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries") |
| 49 |
+ else: |
| 50 |
+ raise |
| 51 |
continue |
| 52 |
|
| 53 |
mf = Manifest(checkdir, repoman_settings["DISTDIR"]) |
| 54 |
|
| 55 |
Modified: main/branches/prefix/doc/package/ebuild/eapi/3.docbook |
| 56 |
=================================================================== |
| 57 |
--- main/branches/prefix/doc/package/ebuild/eapi/3.docbook 2010-01-29 19:07:56 UTC (rev 15273) |
| 58 |
+++ main/branches/prefix/doc/package/ebuild/eapi/3.docbook 2010-01-29 20:43:56 UTC (rev 15274) |
| 59 |
@@ -1,10 +1,10 @@ |
| 60 |
-<section id='package-ebuild-eapi-3_pre2'> |
| 61 |
-<title>EAPI 3_pre2</title> |
| 62 |
-<section id='package-ebuild-eapi-3_pre2-helpers'> |
| 63 |
+<section id='package-ebuild-eapi-3'> |
| 64 |
+<title>EAPI 3</title> |
| 65 |
+<section id='package-ebuild-eapi-3-helpers'> |
| 66 |
<title>Helpers</title> |
| 67 |
-<section id='package-ebuild-eapi-3_pre2-helpers-unpack'> |
| 68 |
+<section id='package-ebuild-eapi-3-helpers-unpack'> |
| 69 |
<title>unpack</title> |
| 70 |
-<section id='package-ebuild-eapi-3_pre2-helpers-unpack-xz'> |
| 71 |
+<section id='package-ebuild-eapi-3-helpers-unpack-xz'> |
| 72 |
<title>Support for the xz file extension</title> |
| 73 |
<para> |
| 74 |
The unpack helper now supports the xz file extension. |
| 75 |
@@ -12,15 +12,15 @@ |
| 76 |
</section> |
| 77 |
</section> |
| 78 |
</section> |
| 79 |
-<section id='package-ebuild-eapi-3_pre2-prefix'> |
| 80 |
+<section id='package-ebuild-eapi-3-prefix'> |
| 81 |
<title>Support for installation prefix</title> |
| 82 |
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers'> |
| 83 |
+<section id='package-ebuild-eapi-3-prefix-helpers'> |
| 84 |
<title>Helpers</title> |
| 85 |
<para> |
| 86 |
Beginning with EAPI 3, all helpers use ${ED} instead of ${D} |
| 87 |
when appropriate. For example, see econf and einstall below. |
| 88 |
</para> |
| 89 |
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers-econf'> |
| 90 |
+<section id='package-ebuild-eapi-3-prefix-helpers-econf'> |
| 91 |
<title>econf</title> |
| 92 |
<programlisting> |
| 93 |
${ECONF_SOURCE:-.}/configure \ |
| 94 |
@@ -37,7 +37,7 @@ |
| 95 |
configure options || die "econf failed" |
| 96 |
</programlisting> |
| 97 |
</section> |
| 98 |
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers-einstall'> |
| 99 |
+<section id='package-ebuild-eapi-3-prefix-helpers-einstall'> |
| 100 |
<title>einstall</title> |
| 101 |
<para> |
| 102 |
Note that, for make-based packages, 'emake install DESTDIR=${D}' (with |
| 103 |
@@ -57,7 +57,7 @@ |
| 104 |
</programlisting> |
| 105 |
</section> |
| 106 |
</section> |
| 107 |
-<section id='package-ebuild-eapi-3_pre2-prefix-variables'> |
| 108 |
+<section id='package-ebuild-eapi-3-prefix-variables'> |
| 109 |
<title>Variables</title> |
| 110 |
<table><title>Installation Prefix Variables</title> |
| 111 |
<tgroup cols='2' align='left' > |
| 112 |
|
| 113 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 114 |
=================================================================== |
| 115 |
--- main/branches/prefix/pym/portage/__init__.py 2010-01-29 19:07:56 UTC (rev 15273) |
| 116 |
+++ main/branches/prefix/pym/portage/__init__.py 2010-01-29 20:43:56 UTC (rev 15274) |
| 117 |
@@ -6089,8 +6089,8 @@ |
| 118 |
|
| 119 |
return rval |
| 120 |
|
| 121 |
-_testing_eapis = frozenset(["3_pre2"]) |
| 122 |
-_deprecated_eapis = frozenset(["3_pre1", "2_pre3", "2_pre2", "2_pre1"]) |
| 123 |
+_testing_eapis = frozenset() |
| 124 |
+_deprecated_eapis = frozenset(["3_pre2", "3_pre1", "2_pre3", "2_pre2", "2_pre1"]) |
| 125 |
|
| 126 |
def _eapi_is_deprecated(eapi): |
| 127 |
return eapi in _deprecated_eapis |
| 128 |
|
| 129 |
Modified: main/branches/prefix/pym/portage/const.py |
| 130 |
=================================================================== |
| 131 |
--- main/branches/prefix/pym/portage/const.py 2010-01-29 19:07:56 UTC (rev 15273) |
| 132 |
+++ main/branches/prefix/pym/portage/const.py 2010-01-29 20:43:56 UTC (rev 15274) |
| 133 |
@@ -95,7 +95,7 @@ |
| 134 |
"package", "preinst", "postinst","prerm", "postrm", |
| 135 |
"nofetch", "config", "info", "other"] |
| 136 |
|
| 137 |
-EAPI = 2 |
| 138 |
+EAPI = 3 |
| 139 |
|
| 140 |
HASHING_BLOCKSIZE = 32768 |
| 141 |
MANIFEST1_HASH_FUNCTIONS = ["MD5", "SHA256", "RMD160"] |
| 142 |
|
| 143 |
Modified: main/branches/prefix/pym/portage/locks.py |
| 144 |
=================================================================== |
| 145 |
--- main/branches/prefix/pym/portage/locks.py 2010-01-29 19:07:56 UTC (rev 15273) |
| 146 |
+++ main/branches/prefix/pym/portage/locks.py 2010-01-29 20:43:56 UTC (rev 15274) |
| 147 |
@@ -89,8 +89,8 @@ |
| 148 |
unlinkfile=unlinkfile, waiting_msg=waiting_msg, |
| 149 |
flags=flags) |
| 150 |
else: |
| 151 |
- writemsg(_("Cannot chown a lockfile. This could " |
| 152 |
- "cause inconvenience later.\n")) |
| 153 |
+ writemsg(_("Cannot chown a lockfile: '%s'\n") % \ |
| 154 |
+ lockfilename, noiselevel=-1) |
| 155 |
|
| 156 |
finally: |
| 157 |
os.umask(old_mask) |
Archives