| 1 |
commit: bb3094fb926910594f26ac3cf246d9aa9f9444d9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 1 20:51:18 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 1 20:51:18 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bb3094fb |
| 7 |
|
| 8 |
_prepare_self_update: ignore installed version |
| 9 |
|
| 10 |
Now portage will unconditionally make a temporary copy of itself during |
| 11 |
updates. This is safer, since it provides maximum protection against |
| 12 |
any possible incompatibilities. For example, suppose that the ebuild |
| 13 |
has been updated to change the location of installed files (such as |
| 14 |
libdir change) without a revision bump. |
| 15 |
|
| 16 |
--- |
| 17 |
pym/_emerge/Scheduler.py | 13 ++++--------- |
| 18 |
pym/portage/package/ebuild/doebuild.py | 9 ++------- |
| 19 |
2 files changed, 6 insertions(+), 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
| 22 |
index 8ee9a58..9f1c86e 100644 |
| 23 |
--- a/pym/_emerge/Scheduler.py |
| 24 |
+++ b/pym/_emerge/Scheduler.py |
| 25 |
@@ -300,15 +300,10 @@ class Scheduler(PollScheduler): |
| 26 |
if not portage.dep.match_from_list( |
| 27 |
portage.const.PORTAGE_PACKAGE_ATOM, [x]): |
| 28 |
continue |
| 29 |
- if self._running_portage is None or \ |
| 30 |
- self._running_portage.cpv != x.cpv or \ |
| 31 |
- '9999' in x.cpv or \ |
| 32 |
- 'git' in x.inherited or \ |
| 33 |
- 'git-2' in x.inherited: |
| 34 |
- rval = _check_temp_dir(self.settings) |
| 35 |
- if rval != os.EX_OK: |
| 36 |
- return rval |
| 37 |
- _prepare_self_update(self.settings) |
| 38 |
+ rval = _check_temp_dir(self.settings) |
| 39 |
+ if rval != os.EX_OK: |
| 40 |
+ return rval |
| 41 |
+ _prepare_self_update(self.settings) |
| 42 |
break |
| 43 |
|
| 44 |
return os.EX_OK |
| 45 |
|
| 46 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 47 |
index 4c0c45d..9b678f7 100644 |
| 48 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 49 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 50 |
@@ -2129,11 +2129,6 @@ def _handle_self_update(settings, vardb): |
| 51 |
if settings["ROOT"] == "/" and \ |
| 52 |
portage.dep.match_from_list( |
| 53 |
portage.const.PORTAGE_PACKAGE_ATOM, [cpv]): |
| 54 |
- inherited = frozenset(settings.get('INHERITED', '').split()) |
| 55 |
- if not vardb.cpv_exists(cpv) or \ |
| 56 |
- '9999' in cpv or \ |
| 57 |
- 'git' in inherited or \ |
| 58 |
- 'git-2' in inherited: |
| 59 |
- _prepare_self_update(settings) |
| 60 |
- return True |
| 61 |
+ _prepare_self_update(settings) |
| 62 |
+ return True |
| 63 |
return False |
Archives