summaryrefslogtreecommitdiffstats
path: root/bin/emerge
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo. (trunk r10538)v2.1.5.3Zac Medico2008-06-011-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=10539
* Mention masked packages in another --resume message. (trunk r10535)Zac Medico2008-06-011-3/+3
| | | | svn path=/main/branches/2.1.2/; revision=10537
* Reference depgraph.UnsatisfiedResumeDep instead of mydepgraph since theZac Medico2008-06-011-1/+1
| | | | | | | latter can trigger an UnboundLocalError in some cases (^C for example). (trunk r10533) svn path=/main/branches/2.1.2/; revision=10536
* Update the --skipfirst dropped packages warning to mention "masking"Zac Medico2008-06-011-1/+2
| | | | | | in addition to unsatisfied dependencies. svn path=/main/branches/2.1.2/; revision=10534
* Update the UnsatisfiedResumeDep display to distinguish masked packagesZac Medico2008-06-011-6/+13
| | | | | | from those with unsatisfied dependencies. (trunk r10529) svn path=/main/branches/2.1.2/; revision=10531
* Revert changes wrt argument atoms in the previous commit since it's notZac Medico2008-06-011-10/+8
| | | | | | really useful. (trunk r10528) svn path=/main/branches/2.1.2/; revision=10530
* Make --skipfirst tolerate masked packages by dropping them (similar toZac Medico2008-06-011-10/+18
| | | | | | | how it would drop a package that has an unsatisfied dependency). (trunk r10526) svn path=/main/branches/2.1.2/; revision=10527
* Make PackageSet._setAtoms() use existing Atom instances when available.Zac Medico2008-05-311-5/+11
| | | | | | (trunk r10523) svn path=/main/branches/2.1.2/; revision=10524
* Fix create_world_atom() to take a Package instance in it's arguments.Zac Medico2008-05-311-11/+7
| | | | | | (trunk r10521) svn path=/main/branches/2.1.2/; revision=10522
* * Tweak isvalidatom() to treat "null" category as valid, but missing categoryZac Medico2008-05-311-2/+1
| | | | | | | | | | | | as invalid (previously both where treated as invalid). * Fix a spot inside emerge's unmerge() function that sometimes generates invalid atoms by adding an unnecessary "=" to the front. Even when in cases that resulted in a valid atom here, adding the "=" was redundant because dep_expand() does that automatically now (for backward compat). (trunk r10516) svn path=/main/branches/2.1.2/; revision=10517
* Optimize the new --skipfirst code so that in only has to buildZac Medico2008-05-311-7/+37
| | | | | | | | | a new depgraph one time when there are unsatisfied deps. This works by recursively traversing the digraph to remove the parent packages whose deps become unsatisfied when their dependencies are pruned from the mergelist. (trunk r10512:10514) svn path=/main/branches/2.1.2/; revision=10515
* Fix PackageSet.findAtomForPackage() to find the most specific atom sinceZac Medico2008-05-301-4/+13
| | | | | | | it can affect behavior when deciding whether or not to add a slot atom to the world file. (trunk r10511) svn path=/main/branches/2.1.2/; revision=10512
* Pass a mutable config instance into get_masking_status(). CurrentlyZac Medico2008-05-301-1/+1
| | | | | | | | it doesn't matter for installed packages but it's safer to be consistent to avoid accidental breakage in the future. (trunk r10503) svn path=/main/branches/2.1.2/; revision=10504
* Make PackageSet.findAtomForPackage() just return the first atom foundZac Medico2008-05-301-3/+3
| | | | | | | since best_match_to_list() won't work correctly for atoms matched via PROVIDE. (trunk r10501) svn path=/main/branches/2.1.2/; revision=10502
* When dropping deps from the resume list, make sure that the loop can'tZac Medico2008-05-291-1/+2
| | | | | | be infinite. (trunk r10493) svn path=/main/branches/2.1.2/; revision=10494
* Use Package.metadata instead of calling dbapi.aux_get(). (trunk r10491)Zac Medico2008-05-291-2/+1
| | | | svn path=/main/branches/2.1.2/; revision=10492
* Use a frozenset instead of a list for containment tests. (trunk r10489)Zac Medico2008-05-291-3/+2
| | | | svn path=/main/branches/2.1.2/; revision=10490
* Fix typo. (trunk r10487)Zac Medico2008-05-291-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=10488
* Use izip() to eliminate temporary dict instances. (trunk r10485)Zac Medico2008-05-291-18/+19
| | | | svn path=/main/branches/2.1.2/; revision=10486
* Use portage_exception.InvalidAtom directly instead of from portage_dep.Zac Medico2008-05-291-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=10484
* Make --skipfirst handle missing dependencies by dropping the merge tasksZac Medico2008-05-291-12/+48
| | | | | | | | | | | | | | that have missing dependencies. This involves creating an entirely new depgraph each time that a missing dependency is discovered. This isn't the most efficient approach but it's simple and it works well. This new behavior can server as a fix for bug #12768 by calling emerge --resume --skipfirst each time that emerge exits unsuccessfully. This was possible before, but now packages with unsatisfied dependencies will be properly identified and dropped from the list. (trunk r10477:10482) svn path=/main/branches/2.1.2/; revision=10483
* Filter out installed keyword masked packages when populatingZac Medico2008-05-291-1/+3
| | | | | | | | RootConfig.visible_pkgs since otherwise such packages can trigger undesireable results inside depgraph._iter_atoms_for_pkg(). (trunk r10471) svn path=/main/branches/2.1.2/; revision=10473
* Fix the code from bug #220341 so that it matches the atom against theZac Medico2008-05-291-2/+12
| | | | | | installed package, like it's supposed to. (trunk r10470) svn path=/main/branches/2.1.2/; revision=10472
* * Update the fix from bug #220341 to protect USE deps from being neglected.Zac Medico2008-05-281-5/+13
| | | | | | | * Skip redundant Atom construction in select_package(). (trunk r10466:10468) svn path=/main/branches/2.1.2/; revision=10469
* Bug #223447 - Adjust the "installed packages are masked" display to recognizeZac Medico2008-05-281-9/+44
| | | | | | | | | | packages that are masked by keywords and are eligible for uninstallation by depclean. This is a workaround for the fact that depclean may fail to recognize that the package is eligible for uninstall due to differences in visibility filtering which can lead to differences in || dep evaluation. TODO: Share visibility code to fix this inconsistency. (trunk r10465) svn path=/main/branches/2.1.2/; revision=10466
* Fix breakage due to frozenset being immutable. (trunk r10455)Zac Medico2008-05-271-2/+2
| | | | svn path=/main/branches/2.1.2/; revision=10456
* Fix a typo from the previous commit. (trunk r10450)Zac Medico2008-05-271-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=10451
* Use new Package.use and iuse attributes to avoid extra split() calls.Zac Medico2008-05-271-22/+13
| | | | | | (trunk r10448) svn path=/main/branches/2.1.2/; revision=10449
* Fix breakage in the BlockerDB constructor. (trunk r10443)Zac Medico2008-05-271-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=10444
* Merge code for the Package.root_config attribute from trunk r10440,Zac Medico2008-05-271-50/+83
| | | | | | excluding USE deps code. svn path=/main/branches/2.1.2/; revision=10442
* Bug #223685 - Use the finally clause to collect elog messages justZac Medico2008-05-271-3/+1
| | | | | | | before releasing the build dir lock, so they never get missed. (trunk r10438) svn path=/main/branches/2.1.2/; revision=10439
* Add some debug output for arguments and their associated atoms, to help inZac Medico2008-05-271-1/+8
| | | | | | debugging problems similar to bug #223735. (trunk r10436) svn path=/main/branches/2.1.2/; revision=10437
* Don't silently swallow instances of UnpicklingError since they are easilyZac Medico2008-05-261-2/+5
| | | | | | | triggered by storing instances of custom classes in a pickle. (trunk r10432:10434) svn path=/main/branches/2.1.2/; revision=10435
* Avoid triggering "cPickle.UnpicklingError: Global and instance picklesZac Medico2008-05-261-3/+13
| | | | | | | are not supported." errors that are triggered when the pickle contains custom classes. (trunk r10431) svn path=/main/branches/2.1.2/; revision=10432
* * Enable config.setcpv() to use a Package instance in place of a cpv.Zac Medico2008-05-261-24/+26
| | | | | | | | * Make depgraph._select_package() pass Package instances into setcpv() calls. * Enable the Package constructor to use an iterable for metadata items. (trunk r10427) svn path=/main/branches/2.1.2/; revision=10428
* * Add support for Package instances in match_from_list().Zac Medico2008-05-251-21/+47
| | | | | | | * Remove the Package.cpv_slot attribute. (trunk r10418:10423) svn path=/main/branches/2.1.2/; revision=10424
* * Fix PackageSet.findAtomForPackage() to take a Package instance asZac Medico2008-05-251-35/+18
| | | | | | | | | an argument. * Simplify PackageSet.findAtomForPackage() by implementing it on top of iterAtomsForPackage(). (trunk r10415) svn path=/main/branches/2.1.2/; revision=10416
* Facilitate creation of Atom instances in a few obvious places:Zac Medico2008-05-251-4/+14
| | | | | | | | * PackageSet._setAtoms() * AtomArg and PackageArg constructors. (trunk r10413) svn path=/main/branches/2.1.2/; revision=10414
* Bug #223417 - Make the vardbapi.cpv_all() use_cache parameter usefulZac Medico2008-05-251-1/+1
| | | | | | | | | for forcing direct os.listdir() calls. This is more of an issue now that these listdir() calls are frequently triggered when merging packages (due to things like blocker and preserve-libs handling). (trunk r10390) svn path=/main/branches/2.1.2/; revision=10406
* Merge the Atom class and dbapi._iter_match() from trunk r10387 and r10394.Zac Medico2008-05-251-1/+2
| | | | | | Everything related to USE deps has been omitted for now. svn path=/main/branches/2.1.2/; revision=10403
* In unmerge(), flush the vardbapi aux_get() cache to disk before releasingZac Medico2008-05-181-0/+1
| | | | | | the vardb lock. (trunk r10361) svn path=/main/branches/2.1.2/; revision=10363
* Fix th logic from the previous commit. (trunk r10350)Zac Medico2008-05-171-1/+4
| | | | svn path=/main/branches/2.1.2/; revision=10355
* Add back the "install new portage asap" behavior that got lost when thatZac Medico2008-05-171-0/+1
| | | | | | area of code was rewritten. (trunk r10349) svn path=/main/branches/2.1.2/; revision=10354
* Remove 'eselect compiler' references (trunk r10328)Zac Medico2008-05-131-6/+0
| | | | svn path=/main/branches/2.1.2/; revision=10331
* In the warning about eclasses in overlay overriding eclasses from PORTDIR,Zac Medico2008-05-121-1/+2
| | | | | | | also advise the user to add FEATURES="metadata-transfer" to make.conf. (trunk r10310) svn path=/main/branches/2.1.2/; revision=10311
* If the uninstall task did not need to be executed becauseZac Medico2008-05-101-2/+13
| | | | | | | | of an upgrade, display Blocker -> Upgrade edges since the corresponding Blocker -> Uninstall edges will not be shown. (trunk r10286) svn path=/main/branches/2.1.2/; revision=10287
* Always include satisfied blockers as an indicator that blockingZac Medico2008-05-101-6/+8
| | | | | | packages will be temporarily installed simultaneously. (trunk r10281) svn path=/main/branches/2.1.2/; revision=10282
* When selecting leaf nodes, if there is a mix of merge and uninstallZac Medico2008-05-101-2/+12
| | | | | | | | nodes, save the uninstall nodes from later since sometimes a merge node will render an install node unnecessary, and we want to avoid doing a separate uninstall task in that case. (trunk r10279) svn path=/main/branches/2.1.2/; revision=10280
* Fix another KeyError, reported in Bug #221107, comment #4. There's no needZac Medico2008-05-101-2/+0
| | | | | | | to remove uninstall tasks from scheduled_uninstalls, so just keep them in there. (trunk r10277) svn path=/main/branches/2.1.2/; revision=10278
* Bug #221053 - Save the resume list before verifying the ebuild ManifestsZac Medico2008-05-091-4/+7
| | | | | | | since it might be possible for the user to use --resume --skipfirst get past a non-essential package with a broken digest. (trunk r10275) svn path=/main/branches/2.1.2/; revision=10276