| 1 |
Author: zmedico |
| 2 |
Date: 2009-01-21 22:49:42 +0000 (Wed, 21 Jan 2009) |
| 3 |
New Revision: 12543 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #199408 - Always enable the skip_masked and skip_unsatisfied for the |
| 9 |
resume_depgraph() function. This will cause emerge --resume to automatically |
| 10 |
drop masked packages (without the need to specify --skipfirst). |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2009-01-21 21:27:20 UTC (rev 12542) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2009-01-21 22:49:42 UTC (rev 12543) |
| 17 |
@@ -10867,7 +10867,7 @@ |
| 18 |
try: |
| 19 |
success, mydepgraph, dropped_tasks = resume_depgraph( |
| 20 |
self.settings, self.trees, self._mtimedb, self.myopts, |
| 21 |
- myparams, self._spinner, skip_unsatisfied=True) |
| 22 |
+ myparams, self._spinner) |
| 23 |
except depgraph.UnsatisfiedResumeDep, e: |
| 24 |
mydepgraph = e.depgraph |
| 25 |
dropped_tasks = set() |
| 26 |
@@ -13660,14 +13660,15 @@ |
| 27 |
else: |
| 28 |
print "Number removed: "+str(len(cleanlist)) |
| 29 |
|
| 30 |
-def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner, |
| 31 |
- skip_masked=False, skip_unsatisfied=False): |
| 32 |
+def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner): |
| 33 |
""" |
| 34 |
Construct a depgraph for the given resume list. This will raise |
| 35 |
PackageNotFound or depgraph.UnsatisfiedResumeDep when necessary. |
| 36 |
@rtype: tuple |
| 37 |
@returns: (success, depgraph, dropped_tasks) |
| 38 |
""" |
| 39 |
+ skip_masked = True |
| 40 |
+ skip_unsatisfied = True |
| 41 |
mergelist = mtimedb["resume"]["mergelist"] |
| 42 |
dropped_tasks = set() |
| 43 |
while True: |
| 44 |
@@ -13870,14 +13871,11 @@ |
| 45 |
del mergelist[i] |
| 46 |
break |
| 47 |
|
| 48 |
- skip_masked = "--skipfirst" in myopts |
| 49 |
- skip_unsatisfied = "--skipfirst" in myopts |
| 50 |
success = False |
| 51 |
mydepgraph = None |
| 52 |
try: |
| 53 |
success, mydepgraph, dropped_tasks = resume_depgraph( |
| 54 |
- settings, trees, mtimedb, myopts, myparams, spinner, |
| 55 |
- skip_masked=skip_masked, skip_unsatisfied=skip_unsatisfied) |
| 56 |
+ settings, trees, mtimedb, myopts, myparams, spinner) |
| 57 |
except (portage.exception.PackageNotFound, |
| 58 |
depgraph.UnsatisfiedResumeDep), e: |
| 59 |
if isinstance(e, depgraph.UnsatisfiedResumeDep): |
Archives