diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-31 11:45:28 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-31 11:45:28 -0700 |
| commit | 75dab994c4a3e7c38ea29cc633706c435991da05 (patch) | |
| tree | ed60a2e5ef4ffa3f93f4cb82104b1ee93923bf95 /pym/_emerge/Scheduler.py | |
| parent | cd08c946dce4f9f5466597e92ce9df3b0ff197bd (diff) | |
| download | portage-75dab994c4a3e7c38ea29cc633706c435991da05.tar.gz portage-75dab994c4a3e7c38ea29cc633706c435991da05.tar.bz2 portage-75dab994c4a3e7c38ea29cc633706c435991da05.zip | |
When portage updates itself and the new version either inherits
git.eclass or has 9999 in its version, trigger the 'use copy of current
sources for install, then restart portage' routine. This is required
since with the live git portage-9999 ebuild we can't use the version
to detect incompatible changes to ebuild.sh. This issue was noticed
due to recent versions of ebuild.sh expecting PORTAGE_BZIP2_COMMAND to
be set, causing incompatibility with installed portage-9999 instances.
Diffstat (limited to 'pym/_emerge/Scheduler.py')
| -rw-r--r-- | pym/_emerge/Scheduler.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index ee5b8a3d5..b78be89f9 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -828,9 +828,12 @@ class Scheduler(PollScheduler): if pkg.root == self._running_root.root and \ portage.match_from_list( portage.const.PORTAGE_PACKAGE_ATOM, [pkg]): - if self._running_portage: - return pkg.cpv != self._running_portage.cpv - return True + if self._running_portage is None: + return True + elif pkg.cpv != self._running_portage.cpv or \ + '9999' in pkg.cpv or \ + 'git' in pkg.inherited: + return True return False def _restart_if_necessary(self, pkg): |