| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-24 03:17:26 +0000 (Thu, 24 Apr 2008) |
| 3 |
New Revision: 9956 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix interaction between automatic uninstall and options like --pretend, |
| 9 |
--fetchonly, and --buildpkgonly. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-04-24 02:55:58 UTC (rev 9955) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-04-24 03:17:26 UTC (rev 9956) |
| 16 |
@@ -4870,6 +4870,7 @@ |
| 17 |
def _merge(self, mylist, favorites, mtimedb): |
| 18 |
from portage.elog import elog_process |
| 19 |
from portage.elog.filtering import filter_mergephases |
| 20 |
+ buildpkgonly = "--buildpkgonly" in self.myopts |
| 21 |
failed_fetches = [] |
| 22 |
fetchonly = "--fetchonly" in self.myopts or \ |
| 23 |
"--fetch-all-uri" in self.myopts |
| 24 |
@@ -5021,7 +5022,8 @@ |
| 25 |
cpv=pkg_key, built=built, installed=installed, |
| 26 |
metadata=metadata) |
| 27 |
if pkg.installed: |
| 28 |
- self._uninstall_queue.append(pkg) |
| 29 |
+ if not (buildpkgonly or fetchonly or pretend): |
| 30 |
+ self._uninstall_queue.append(pkg) |
| 31 |
continue |
| 32 |
|
| 33 |
if x[0]=="blocks": |
| 34 |
|
| 35 |
-- |
| 36 |
gentoo-commits@l.g.o mailing list |
Archives