2.1_pre5-r1 regression fix release

Package-Manager: portage-2.1_pre5

6 files changed, 67 insertions, 39 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index dbb1c39e0874..835e85661270 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.80 2006/02/26 03:33:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.81 2006/02/26 20:33:40 zmedico Exp $
+
+  26 Feb 2006; Zac Medico <zmedico@gentoo.org>
+  +portage-2.1_pre5-r1.ebuild:
+  Regression fix for bug #124140 'Bad file descriptor' error when hardlink
+  file locking is used.
 
 *portage-2.1_pre5 (25 Feb 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 30c2effd881e..2e934b7224bc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,9 @@
-MD5 f6312ff04cf008bb55fe505b3e6f13cf ChangeLog 5216
-RMD160 92f55bcf6475423cd92c3935f9d7995573c05209 ChangeLog 5216
-SHA256 369ca456288be9f3feb5423536d348927ce6f300f5a0557f759dbb67b2772aca ChangeLog 5216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9ef39b57da3616553971e0857da41dd1 ChangeLog 5394
+RMD160 f289ac6a256c7c44faa3b2977c7835ef3f92199f ChangeLog 5394
+SHA256 30cf8605169dc701259a899390526a9d0e87e0fa1d31aa49aef2af3e4b6bd876 ChangeLog 5394
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -10,9 +13,9 @@ SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.
 MD5 e3d8f54d06dce6fa8c4b9a9ff660f96e files/2.1_pre4-r1.patch 1581
 RMD160 6bb0f83e5c562b71ce63b2ab51af89144f28cce4 files/2.1_pre4-r1.patch 1581
 SHA256 057f3599ccda5f07091b3e9da51575fe56f3e9307e51224c68b9e63887ff99da files/2.1_pre4-r1.patch 1581
-MD5 3f6f964cc783d83e19d5243f954a5f72 files/2.1_pre5.patch 1125
-RMD160 16f8e79df5d16835ff00fe3d8f31fe7b472b2d30 files/2.1_pre5.patch 1125
-SHA256 73352f24339f1a64ceabbdd77939fbb6eede31bd0399cdbcd6bb8940cd9f01d6 files/2.1_pre5.patch 1125
+MD5 5e3dc02edd54f963800ceb1ff1f1a611 files/2.1_pre5-r1.patch 1703
+RMD160 5c3eeb917b88a885289a6c838dab1131686d3051 files/2.1_pre5-r1.patch 1703
+SHA256 fb5bd88d027102f15a943898dc49d77668e4078070dfcf5dcd89f267180869ff files/2.1_pre5-r1.patch 1703
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -31,9 +34,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di
 MD5 ab666914bfcfa91049d1df6dee3980b1 files/digest-portage-2.1_pre4-r1 253
 RMD160 441595004e217e45c80c5bb793709b2414bcf875 files/digest-portage-2.1_pre4-r1 253
 SHA256 c5fe2a7d208a3e73056160d113ebe433bd4f039b1d0edf0261afe657a47bdb57 files/digest-portage-2.1_pre4-r1 253
-MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5 253
-RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5 253
-SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5 253
+MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r1 253
+RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r1 253
+SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r1 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -55,6 +58,13 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-
 MD5 156418acea4b688132aa58236b85b065 portage-2.1_pre4-r1.ebuild 4734
 RMD160 4af37c32e2eff9d15a7ec3c4db28b55f4fd4ddc1 portage-2.1_pre4-r1.ebuild 4734
 SHA256 eec24ea13ee7ad39ad41e2a98488c4a7ff0c71a146112fbf806e9d24ee77ae23 portage-2.1_pre4-r1.ebuild 4734
-MD5 e447e6256764e84b3f1047b9ab274178 portage-2.1_pre5.ebuild 4760
-RMD160 bb73284d3cba2317010e1a7198f1608099116109 portage-2.1_pre5.ebuild 4760
-SHA256 708d89bfa40279cdc33a8247d2b905b9cb974a5d75e323fefaf31116b42951f7 portage-2.1_pre5.ebuild 4760
+MD5 6ab066ae354f81d5b70d80500ed9eef2 portage-2.1_pre5-r1.ebuild 4766
+RMD160 92a8b4b2663dc4a4ebe160651aca21e3c57c81a3 portage-2.1_pre5-r1.ebuild 4766
+SHA256 47f633949a8074e019a3ce8441d693a5a44970b997199b4e8f359bb3c603b026 portage-2.1_pre5-r1.ebuild 4766
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEAhCl/ejvha5XGaMRAtmJAJ9mreT30X/9oBBkUBLzc04fY/hDKQCg5NOo
+00Xud2yGUKXRgXcd4XZGoMw=
+=rH0G
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre5-r1.patch b/sys-apps/portage/files/2.1_pre5-r1.patch
new file mode 100644
index 000000000000..ddaea3e73541
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5-r1.patch
@@ -0,0 +1,37 @@
+diff -Nur portage-2.1_pre5/bin/emerge portage-2.1_pre5-r1/bin/emerge
+--- portage-2.1_pre5/bin/emerge	2006-02-20 16:58:13.000000000 -0800
++++ portage-2.1_pre5-r1/bin/emerge	2006-02-26 03:39:28.000000000 -0800
+@@ -1934,7 +1934,7 @@
+ 			y=portage.portdb.findname(x[pkgindex])
+ 			if not "--pretend" in myopts:
+ 				print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1]
+-				emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
++				emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
+ 
+ 			self.pkgsettings["EMERGE_FROM"] = x[0][:]
+ 			self.pkgsettings.backup_changes("EMERGE_FROM")
+diff -Nur portage-2.1_pre5/pym/portage_locks.py portage-2.1_pre5-r1/pym/portage_locks.py
+--- portage-2.1_pre5/pym/portage_locks.py	2006-02-15 10:36:48.000000000 -0800
++++ portage-2.1_pre5-r1/pym/portage_locks.py	2006-02-26 03:39:05.000000000 -0800
+@@ -122,7 +122,8 @@
+ 			raise
+ 
+ 		
+-	if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1:
++	if type(lockfilename) == types.StringType and \
++		myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1:
+ 		# The file was deleted on us... Keep trying to make one...
+ 		os.close(myfd)
+ 		portage_util.writemsg("lockfile recurse\n",1)
+diff -Nur portage-2.1_pre5/pym/portage.py portage-2.1_pre5-r1/pym/portage.py
+--- portage-2.1_pre5/pym/portage.py	2006-02-21 02:01:08.000000000 -0800
++++ portage-2.1_pre5-r1/pym/portage.py	2006-02-26 03:39:28.000000000 -0800
+@@ -5334,6 +5334,8 @@
+ 		return 1
+ 
+ 	def update_ents(self, update_iter):
++		if len(update_iter) == 0:
++			return
+ 		if not self.populated:
+ 			self.populate()
+ 
diff --git a/sys-apps/portage/files/2.1_pre5.patch b/sys-apps/portage/files/2.1_pre5.patch
deleted file mode 100644
index 315877a5b7ae..000000000000
--- a/sys-apps/portage/files/2.1_pre5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur portage-2.1_pre5/bin/emerge portage-2.1_pre5.patched/bin/emerge
---- portage-2.1_pre5/bin/emerge	2006-02-20 16:58:13.000000000 -0800
-+++ portage-2.1_pre5.patched/bin/emerge	2006-02-22 16:44:48.000000000 -0800
-@@ -1934,7 +1934,7 @@
- 			y=portage.portdb.findname(x[pkgindex])
- 			if not "--pretend" in myopts:
- 				print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1]
--				emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
-+				emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
- 
- 			self.pkgsettings["EMERGE_FROM"] = x[0][:]
- 			self.pkgsettings.backup_changes("EMERGE_FROM")
-diff -Nur portage-2.1_pre5/pym/portage.py portage-2.1_pre5.patched/pym/portage.py
---- portage-2.1_pre5/pym/portage.py	2006-02-21 02:01:08.000000000 -0800
-+++ portage-2.1_pre5.patched/pym/portage.py	2006-02-22 16:44:32.000000000 -0800
-@@ -5334,6 +5334,8 @@
- 		return 1
- 
- 	def update_ents(self, update_iter):
-+		if len(update_iter) == 0:
-+			return
- 		if not self.populated:
- 			self.populate()
- 
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre5 b/sys-apps/portage/files/digest-portage-2.1_pre5-r1
index c818d7ae4b7c..c818d7ae4b7c 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre5
+++ b/sys-apps/portage/files/digest-portage-2.1_pre5-r1
diff --git a/sys-apps/portage/portage-2.1_pre5.ebuild b/sys-apps/portage/portage-2.1_pre5-r1.ebuild
index b780608c0e2d..9a19df514824 100644
--- a/sys-apps/portage/portage-2.1_pre5.ebuild
+++ b/sys-apps/portage/portage-2.1_pre5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre5.ebuild,v 1.1 2006/02/26 03:33:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre5-r1.ebuild,v 1.1 2006/02/26 20:33:41 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -32,7 +32,7 @@ S=${WORKDIR}/${PN}-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	patch -p1 < "${FILESDIR}"/2.1_pre5.patch || die "Failed to apply patch"
+	patch -p1 < "${FILESDIR}"/2.1_pre5-r1.patch || die "Failed to apply patch"
 }
 
 src_compile() {