| 1 |
commit: f8d53442d2b950a27ab42e66d9ff2d1834c0ddd4 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Feb 5 12:20:44 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 5 16:35:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8d53442 |
| 7 |
|
| 8 |
sys-apps/portage: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3823 |
| 11 |
|
| 12 |
sys-apps/portage/files/portage-2.3.0_rc1.patch | 52 -------------------------- |
| 13 |
1 file changed, 52 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/portage/files/portage-2.3.0_rc1.patch b/sys-apps/portage/files/portage-2.3.0_rc1.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 8464462..00000000 |
| 18 |
--- a/sys-apps/portage/files/portage-2.3.0_rc1.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,52 +0,0 @@ |
| 21 |
-From 9ba1bea5e24fe839ef5bd833c3974a55d5333bf1 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Brian Dolbec <dolsen@g.o> |
| 23 |
-Date: Mon, 16 May 2016 02:45:45 -0700 |
| 24 |
-Subject: [PATCH] portage.const.py: Remove repoman from PORTAGE_PYM_PACKAGES |
| 25 |
- |
| 26 |
-Decca (in IRC) got a traceback due to the missing repoman install |
| 27 |
- |
| 28 |
-sysresccd / # emerge -e @system |
| 29 |
-Calculating dependencies... done! |
| 30 |
-Traceback (most recent call last): |
| 31 |
- File "/usr/lib/python-exec/python3.5/emerge", line 50, in <module> |
| 32 |
- retval = emerge_main() |
| 33 |
- File "/usr/lib64/python3.5/site-packages/_emerge/main.py", line 1185, in emerge_main |
| 34 |
- return run_action(emerge_config) |
| 35 |
- File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 3236, in run_action |
| 36 |
- emerge_config.args, spinner) |
| 37 |
- File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 505, in action_build |
| 38 |
- retval = mergetask.merge() |
| 39 |
- File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 958, in merge |
| 40 |
- rval = self._handle_self_update() |
| 41 |
- File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 323, in _handle_self_update |
| 42 |
- _prepare_self_update(self.settings) |
| 43 |
- File "/usr/lib64/python3.5/site-packages/portage/package/ebuild/doebuild.py", line 2489, in _prepare_self_update |
| 44 |
- symlinks=True) |
| 45 |
- File "/usr/lib64/python3.5/site-packages/portage/__init__.py", line 259, in __call__ |
| 46 |
- rval = self._func(*wrapped_args, **wrapped_kwargs) |
| 47 |
- File "/usr/lib64/python3.5/shutil.py", line 303, in copytree |
| 48 |
- names = os.listdir(src) |
| 49 |
-FileNotFoundError: [Errno 2] No such file or directory: b'/usr/lib64/python3.5/site-packages/repoman' |
| 50 |
- |
| 51 |
-Dirkjan <djc> found repoman was still included in the PORTAGE_PYM_PACKAGES which |
| 52 |
-caused the traceback. |
| 53 |
---- |
| 54 |
- pym/portage/const.py | 2 +- |
| 55 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 56 |
- |
| 57 |
-diff --git a/pym/portage/const.py b/pym/portage/const.py |
| 58 |
-index 814d7f4..179efce 100644 |
| 59 |
---- a/pym/portage/const.py |
| 60 |
-+++ b/pym/portage/const.py |
| 61 |
-@@ -278,7 +278,7 @@ SUPPORTED_XPAK_EXTENSIONS = (".tbz2", ".xpak") |
| 62 |
- TIMESTAMP_FORMAT = "%a, %d %b %Y %H:%M:%S +0000" # to be used with time.gmtime() |
| 63 |
- |
| 64 |
- # Top-level names of Python packages installed by Portage. |
| 65 |
--PORTAGE_PYM_PACKAGES = ("_emerge", "portage", "repoman") |
| 66 |
-+PORTAGE_PYM_PACKAGES = ("_emerge", "portage") |
| 67 |
- |
| 68 |
- RETURNCODE_POSTINST_FAILURE = 5 |
| 69 |
- |
| 70 |
--- |
| 71 |
-2.8.2 |
| 72 |
- |
Archives