diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-25 20:46:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-25 20:46:25 +0000 |
| commit | 33de10dca67c482e76fec2f60fc28cf4f875b058 (patch) | |
| tree | f158f28c34f1467815121b9050f1302805bc8558 | |
| parent | depend virtual/jpeg (diff) | |
| download | historical-33de10dca67c482e76fec2f60fc28cf4f875b058.tar.gz historical-33de10dca67c482e76fec2f60fc28cf4f875b058.tar.bz2 historical-33de10dca67c482e76fec2f60fc28cf4f875b058.zip | |
25 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Fix broken doexe call with all symlinks.
Package-Manager: portage-2.2.0_alpha25/cvs/Linux i686
| -rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 10 |
3 files changed, 15 insertions, 10 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index ea46c3cdcaf8..68dce82227cb 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.803 2011/02/22 19:46:40 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.804 2011/02/25 20:46:25 zmedico Exp $ + + 25 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Fix broken doexe call with all symlinks. *portage-2.2.0_alpha25 (22 Feb 2011) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index c274f5f25889..65801e8f87dd 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -21,13 +21,13 @@ EBUILD portage-2.1.9.40.ebuild 10108 RMD160 7e79f28efb1af4d1641f36e95de4fa8b3193 EBUILD portage-2.1.9.41.ebuild 10108 RMD160 78778e10edfc534a6451d8feee600ee2752c104a SHA1 0949dd285cd63b7b072c05372ad908f0fad4ec97 SHA256 dd28e23e99895cd80578a89319f694eb54d74762c2e1ca224d63d736f799660b EBUILD portage-2.2.0_alpha24.ebuild 11870 RMD160 87a5a47ac67a01ad8efea8fdefc6793320e41d22 SHA1 1b3ae9c15bbf46eb29cf73061dff24be4e08568c SHA256 54910bc98a15a71ce27cef9b4da72cbe7d265c8b8e44db1416cd0ec3c166de16 EBUILD portage-2.2.0_alpha25.ebuild 11870 RMD160 fabab2653cc92e4334ed04a4523cf48752087aab SHA1 c1fe6f556ec938ee63ef1cf264e19ec49952dfcb SHA256 34e9dc4678ac11d668ec4522f1e3ea334a2ce8dce735a8bb33df3217d106e0c5 -EBUILD portage-9999.ebuild 11085 RMD160 f05d90cde3ddbd1d4d81254f8cc32a81b3c2cd47 SHA1 14923ef96ea469d6e581760bf6660e717dd56d42 SHA256 abdec42081a5dfad2fa5267fb0fcad0310e16bd48e2393d9cd56698cd1f70c97 -MISC ChangeLog 60428 RMD160 e8273854b4df91cdb8d56768b748dbbfa7b811ce SHA1 8502442a6f679d0b7aa2c2028ee022a8850dca10 SHA256 a9e1666666f809d5385a8938c7c1ae9120944694684722f0a37d02159f12625d +EBUILD portage-9999.ebuild 11135 RMD160 764fe0e66765c6dcef8c6cc913c7023e67134b02 SHA1 204b6e4eeeaefbf350736c1c972286f8a2c616a5 SHA256 a889364030377df96880a7112a1fcfd69bfd377cad3413ab566c65934fa0b836 +MISC ChangeLog 60540 RMD160 553eabf79921d6e63caef61d72297f661170f215 SHA1 11c061fabca77988dbe2f8ae793e0230f38fb2c3 SHA256 a1b879ac5b9f6cdc08d5303c95546cbfec8727d9d3f67c1846c453268abac9ec MISC metadata.xml 724 RMD160 becdb078c637d12e9d7402cd9297a942c657717e SHA1 ce260048be905d15470185ad22ee57a192f561a6 SHA256 371fa80623857d4e03f85fb64bc58570a4ec030e6376ea2e8d1232b6aa3ebc44 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1kEo0ACgkQ/ejvha5XGaNRcQCfQskvHzf1xMgZmr7kZ4p7rxCn -WpUAoIS6duiqVviOIYyydLfIxs7pMAHp -=DjCQ +iEYEARECAAYFAk1oFQQACgkQ/ejvha5XGaPx7gCgjW1/JlwT1XOEVeyL6TnBfm8n +tmgAnj3Cz4k+sibE7hcFchfuaI3z4oqU +=/YL8 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 546e6407ccb0..28796cd93eab 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.19 2011/02/08 23:00:59 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.20 2011/02/25 20:46:25 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -187,14 +187,16 @@ src_install() { rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" fi - local x symlinks + local x symlinks files cd "$S" || die "cd failed" for x in $(find bin -type d) ; do exeinto $portage_base/$x || die "exeinto failed" cd "$S"/$x || die "cd failed" - doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \ - die "doexe failed" + files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l) + if [ -n "$files" ] ; then + doexe $files || die "doexe failed" + fi symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) if [ -n "$symlinks" ] ; then cp -P $symlinks "$D$portage_base/$x" || die "cp failed" |