| 1 |
commit: fb7c020a6779d020cc781eeb159ab9e60791c9a4 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 29 01:57:24 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 02:01:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7c020a |
| 7 |
|
| 8 |
sys-apps/portage: 2.3.78-r2 revbump for bug 698046 |
| 9 |
|
| 10 |
This avoids confusing "No such file or directory" errors as demonstrated |
| 11 |
by the following test case: |
| 12 |
|
| 13 |
$ ln -s /foo/bar /tmp/sudo-1.8.29rc1.tar.gz |
| 14 |
$ wget http://distfiles.gentoo.org/distfiles/sudo-1.8.29rc1.tar.gz -O /tmp/sudo-1.8.29rc1.tar.gz |
| 15 |
/tmp/sudo-1.8.29rc1.tar.gz: No such file or directory |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/697734 |
| 18 |
Bug: https://bugs.gentoo.org/698046 |
| 19 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 20 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 21 |
|
| 22 |
.../portage/{portage-2.3.78-r1.ebuild => portage-2.3.78-r2.ebuild} | 5 ++++- |
| 23 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 24 |
|
| 25 |
diff --git a/sys-apps/portage/portage-2.3.78-r1.ebuild b/sys-apps/portage/portage-2.3.78-r2.ebuild |
| 26 |
similarity index 95% |
| 27 |
rename from sys-apps/portage/portage-2.3.78-r1.ebuild |
| 28 |
rename to sys-apps/portage/portage-2.3.78-r2.ebuild |
| 29 |
index 81439a8a03c..4a73b9ccc46 100644 |
| 30 |
--- a/sys-apps/portage/portage-2.3.78-r1.ebuild |
| 31 |
+++ b/sys-apps/portage/portage-2.3.78-r2.ebuild |
| 32 |
@@ -103,8 +103,11 @@ pkg_setup() { |
| 33 |
python_prepare_all() { |
| 34 |
distutils-r1_python_prepare_all |
| 35 |
|
| 36 |
- # Apply 0299aedef74e47c0a68acf7905d8714c9578f125 for bug 698046. |
| 37 |
+ # Apply 0299aedef74e47c0a68acf7905d8714c9578f125 and |
| 38 |
+ # 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046. |
| 39 |
sed -e 's|rsync -avP|rsync -LtvP|' -i lib/portage/tests/util/test_getconfig.py || die |
| 40 |
+ sed -e 's|if os.stat(download_path).st_size == 0:|mystat = os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or (stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \ |
| 41 |
+ -i lib/portage/package/ebuild/fetch.py || die |
| 42 |
|
| 43 |
# Apply 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 for bug 698474. |
| 44 |
sed -e 's|if "local" in custommirrors:|if try_mirrors and "local" in custommirrors:|' -i lib/portage/package/ebuild/fetch.py || die |
Archives