portage.git
16 years agoMake post_emerge() exit early if it detects that the vdb state hasn't changed. v2.2_rc14
Zac Medico [Tue, 11 Nov 2008 19:59:49 +0000 (19:59 -0000)]
Make post_emerge() exit early if it detects that the vdb state hasn't changed.
This works by comparing a hash of the COUNTER values for all packages in the
vdb.

svn path=/main/trunk/; revision=11859

16 years agoAllow --keep-going to continue in some cases when a runtime dependency has
Zac Medico [Tue, 11 Nov 2008 19:27:51 +0000 (19:27 -0000)]
Allow --keep-going to continue in some cases when a runtime dependency has
failed to build or install. This involves pruning off the parts of the graph
containing installed packages with unsatisfied dependencies.

svn path=/main/trunk/; revision=11858

16 years agoSimplify code for cloning config instances inside Scheduler.merge().
Zac Medico [Tue, 11 Nov 2008 18:37:37 +0000 (18:37 -0000)]
Simplify code for cloning config instances inside Scheduler.merge().

svn path=/main/trunk/; revision=11856

16 years agoMake FindPortdir() fall back to have_profile_dir() checks if it can't match
Zac Medico [Tue, 11 Nov 2008 18:20:10 +0000 (18:20 -0000)]
Make FindPortdir() fall back to have_profile_dir() checks if it can't match
the current location with anything from PORTDIR_OVERLAY. Assume that an
overlay will contain at least a "repo_name" file while a master repo (portdir)
will contain at least a "profiles.desc" file.

svn path=/main/trunk/; revision=11855

16 years agoDerive the changelog_path variable from the new checkdir_relative variable.
Zac Medico [Tue, 11 Nov 2008 17:53:43 +0000 (17:53 -0000)]
Derive the changelog_path variable from the new checkdir_relative variable.

svn path=/main/trunk/; revision=11854

16 years agoMake FindPortdir() return (None, None, None) on failure, instead of raising
Zac Medico [Tue, 11 Nov 2008 17:46:49 +0000 (17:46 -0000)]
Make FindPortdir() return (None, None, None) on failure, instead of raising
a potentially ambiguous ValueError.

svn path=/main/trunk/; revision=11853

16 years agoInside have_profile_dir(), check for existence of profiles.desc since that
Zac Medico [Tue, 11 Nov 2008 17:39:55 +0000 (17:39 -0000)]
Inside have_profile_dir(), check for existence of profiles.desc since that
makes a little more sense thatn checking for package.mask.

svn path=/main/trunk/; revision=11852

16 years agoUpdate hardcoded "cvs" error messages to show the correct vcs value.
Zac Medico [Tue, 11 Nov 2008 10:19:32 +0000 (10:19 -0000)]
Update hardcoded "cvs" error messages to show the correct vcs value.

svn path=/main/trunk/; revision=11851

16 years agoFix pretend output to show git -a option when committing signed manifest.
Zac Medico [Tue, 11 Nov 2008 10:06:30 +0000 (10:06 -0000)]
Fix pretend output to show git -a option when committing signed manifest.

svn path=/main/trunk/; revision=11850

16 years agoAdd git support. Thanks to Daniel Robbins for the initial patch.
Zac Medico [Tue, 11 Nov 2008 10:04:49 +0000 (10:04 -0000)]
Add git support. Thanks to Daniel Robbins for the initial patch.

svn path=/main/trunk/; revision=11849

16 years agoFix logic from previous commit in Scheduler._choose_pkg() to ensure that
Zac Medico [Tue, 11 Nov 2008 05:39:32 +0000 (05:39 -0000)]
Fix logic from previous commit in Scheduler._choose_pkg() to ensure that
the --nodeps code is only triggered when --jobs > 1.

svn path=/main/trunk/; revision=11848

16 years agoWhen in --nodeps mode, make Scheduler._set_digraph() discard the digraph and
Zac Medico [Tue, 11 Nov 2008 05:01:58 +0000 (05:01 -0000)]
When in --nodeps mode, make Scheduler._set_digraph() discard the digraph and
make Scheduler._choose_pkg() always return the task at the front of the queue.

svn path=/main/trunk/; revision=11847

16 years agoInside depgraph.loadResumeCommand(), initialize self._scheduler_graph when
Zac Medico [Tue, 11 Nov 2008 04:41:49 +0000 (04:41 -0000)]
Inside depgraph.loadResumeCommand(), initialize self._scheduler_graph when
in --nodeps mode in order to avoid an AttributeError later when
self.schedulerGraph() is called.

svn path=/main/trunk/; revision=11846

16 years agoFix --jobs parallel scheduling to ensure that temporary simultaneous
Zac Medico [Mon, 10 Nov 2008 22:30:35 +0000 (22:30 -0000)]
Fix --jobs parallel scheduling to ensure that temporary simultaneous
installation of conflicting packages is avoided when appropriate (especially
for !!atom blockers), but allowed in specific cases that require it. This
is accomplished by reversing specific uninstall edges in the digraph, while
possibly leaving some edges in there original state.

svn path=/main/trunk/; revision=11845

16 years agoRevert r11839 since it's not necessarily desired to invert all uninstall
Zac Medico [Mon, 10 Nov 2008 16:41:05 +0000 (16:41 -0000)]
Revert r11839 since it's not necessarily desired to invert all uninstall
edges. TODO: Invert only the specific edges that the depgraph has decided
are necessary and allowed to be inverted.

svn path=/main/trunk/; revision=11844

16 years agoIn the LinkageMap.findConsumers() docstring, add a note about incompatibility
Zac Medico [Mon, 10 Nov 2008 04:10:06 +0000 (04:10 -0000)]
In the LinkageMap.findConsumers() docstring, add a note about incompatibility
with symlinks created by binutils-config.

svn path=/main/trunk/; revision=11843

16 years ago* Use noiselevel=-1 for preserve-libs ">>> needed" and "<<< !needed" messages
Zac Medico [Sun, 9 Nov 2008 23:02:33 +0000 (23:02 -0000)]
* Use noiselevel=-1 for preserve-libs ">>> needed" and "<<< !needed" messages
  so that they're show even without --verbose mode.
* Sort files for the ">>> needed" display.

svn path=/main/trunk/; revision=11842

16 years agoRemove unused formatter code in show_invalid_depstring_notice().
Zac Medico [Sun, 9 Nov 2008 22:36:06 +0000 (22:36 -0000)]
Remove unused formatter code in show_invalid_depstring_notice().

svn path=/main/trunk/; revision=11841

16 years agoMake show_invalid_depstring_notice() send output to stderr via writemsg_level().
Zac Medico [Sun, 9 Nov 2008 22:32:13 +0000 (22:32 -0000)]
Make show_invalid_depstring_notice() send output to stderr via writemsg_level().

svn path=/main/trunk/; revision=11840

16 years agoInside Scheduler._reverse_uninstall_edges(), iover all nodes rather than just
Zac Medico [Sun, 9 Nov 2008 22:18:21 +0000 (22:18 -0000)]
Inside Scheduler._reverse_uninstall_edges(), iover all nodes rather than just
the merge list, because some uninstall nodes may not be in the merge list
since they will be performed as part of an upgrade within a slot. This solves
a problem with Scheduler._choose_pkg() not parallelizing in some cases when
it should, due to an uninstall node not having it's edge reversed like it's
supposed to.

svn path=/main/trunk/; revision=11839

16 years agoMove initialization of Scheduler._background from the constructor to the
Zac Medico [Sun, 9 Nov 2008 21:29:40 +0000 (21:29 -0000)]
Move initialization of Scheduler._background from the constructor to the
merge() method so that a potential InvalidDependString exception can be
handled there, causing merge() to return unsuccessfully. This avoids having
to raise an exception from the constructor.

svn path=/main/trunk/; revision=11838

16 years agoAdd PROPERTIES=interactive support in depgraph.display() and the
Zac Medico [Sun, 9 Nov 2008 20:36:29 +0000 (20:36 -0000)]
Add PROPERTIES=interactive support in depgraph.display() and the
PackageCounters class.

svn path=/main/trunk/; revision=11837

16 years agoWhen adding parent directories to contents inside
Zac Medico [Sun, 9 Nov 2008 17:19:55 +0000 (17:19 -0000)]
When adding parent directories to contents inside
dblink._add_preserve_libs_to_contents(), account for the trailing slash on
$ROOT in the while loop.

svn path=/main/trunk/; revision=11836

16 years agoHandle a corner case inside dblink._add_preserve_libs_to_contents() in which
Zac Medico [Sun, 9 Nov 2008 16:58:36 +0000 (16:58 -0000)]
Handle a corner case inside dblink._add_preserve_libs_to_contents() in which
a path to be preserved doesn't exist in the contents of the installed instance.

svn path=/main/trunk/; revision=11835

16 years agoUpdate docstring for dblink._find_libs_to_preserve().
Zac Medico [Sun, 9 Nov 2008 16:40:43 +0000 (16:40 -0000)]
Update docstring for dblink._find_libs_to_preserve().

svn path=/main/trunk/; revision=11834

16 years agoInside vardbapi.removeFromContents(), automatically clear the contents cache
Zac Medico [Sun, 9 Nov 2008 09:21:49 +0000 (09:21 -0000)]
Inside vardbapi.removeFromContents(), automatically clear the contents cache
of the dblink instance in case an existing one was passed in.

svn path=/main/trunk/; revision=11833

16 years agoBug #243030 - In PreservedLibraryConsumerSet.load(), avoid rebuilding packages
Zac Medico [Sun, 9 Nov 2008 07:42:25 +0000 (07:42 -0000)]
Bug #243030 - In PreservedLibraryConsumerSet.load(), avoid rebuilding packages
just because they contain preserved libs that happen to be consumers of other
preserved libs.

svn path=/main/trunk/; revision=11832

16 years agoBug #245362 - Rewrite preserve-libs preservation code so that it always relies
Zac Medico [Sun, 9 Nov 2008 07:14:09 +0000 (07:14 -0000)]
Bug #245362 - Rewrite preserve-libs preservation code so that it always relies
on inode comparisons rather than string comparisons. Instead of injecting
libraries into $D before the files are merged, the preservation code now
executes after the files are merged but before the old version is unmerged.
After determining which libs to preserve, the CONTENTS are updated to include
those libs. The PreservedLibsRegistry.register() call is now done just after
the temporary vdb entry has been moved into place, guaranteeing that a valid
vdb entry is in place so that the unregistration code from bug #210501 is no
longer needed.

svn path=/main/trunk/; revision=11831

16 years agoInside LinkageMap, use self._obj_key() whenever possible.
Zac Medico [Sun, 9 Nov 2008 02:03:32 +0000 (02:03 -0000)]
Inside LinkageMap, use self._obj_key() whenever possible.

svn path=/main/trunk/; revision=11830

16 years agoFix $ROOT handlink inside display_preserved_libs().
Zac Medico [Sat, 8 Nov 2008 18:29:23 +0000 (18:29 -0000)]
Fix $ROOT handlink inside display_preserved_libs().

svn path=/main/trunk/; revision=11829

16 years agoWith python-2.6, importing the Crypto.Hash.MD5 and Crypto.Hash.SHA modules
Zac Medico [Sat, 8 Nov 2008 05:12:04 +0000 (05:12 -0000)]
With python-2.6, importing the Crypto.Hash.MD5 and Crypto.Hash.SHA modules
from pycrypto triggers warnings since those modules are implemented using
the deprecated md5 and sha modules from python's stdlib. So, in order to
avoid the warning and the inferior hash implementations that come with them,
never use these particular modules from pycrypto. Instead, use hashlib or
directly use stdlib's md5 and sha modules if necessary. Thanks to Markus
Peloquin for reporting.

svn path=/main/trunk/; revision=11828

16 years agoHandle CommandNotFound exceptions if the scanelf binary happens to be missing,
Zac Medico [Sat, 8 Nov 2008 00:55:40 +0000 (00:55 -0000)]
Handle CommandNotFound exceptions if the scanelf binary happens to be missing,
and disable preserve-libs code in that case.

svn path=/main/trunk/; revision=11827

16 years agoIn LinkageMap.rebuild(), immediately raise a CommandNotFound exception if
Zac Medico [Fri, 7 Nov 2008 22:18:33 +0000 (22:18 -0000)]
In LinkageMap.rebuild(), immediately raise a CommandNotFound exception if
scanelf is missing since otherwise it will lead to a KeyError later on
from findConsumers or findProviders. This will allow the caller to handle
the CommandNotFound exception if necessary, and skip any findConsumers or
findProviders since they won't be able to return valid results.

svn path=/main/trunk/; revision=11826

16 years agoHandle a potential OSError that occurs if the scanelf binary is missing
Zac Medico [Fri, 7 Nov 2008 21:52:48 +0000 (21:52 -0000)]
Handle a potential OSError that occurs if the scanelf binary is missing
when LinkageMap.rebuild() is called.

svn path=/main/trunk/; revision=11825

16 years agoReplace NEEDED.ELF.2 strings with references to LinkageMap._needed_aux_key.
Zac Medico [Fri, 7 Nov 2008 21:40:21 +0000 (21:40 -0000)]
Replace NEEDED.ELF.2 strings with references to LinkageMap._needed_aux_key.

svn path=/main/trunk/; revision=11824

16 years agoImprove the error message that's generated in LinkageMap.rebuild() for corrupt
Zac Medico [Fri, 7 Nov 2008 21:18:44 +0000 (21:18 -0000)]
Improve the error message that's generated in LinkageMap.rebuild() for corrupt
NEEDED.ELF.2 entries.

svn path=/main/trunk/; revision=11823

16 years agoWhen calling scanelf inside LinkageMap.rebuild(), join paths with $ROOT when
Zac Medico [Fri, 7 Nov 2008 21:04:45 +0000 (21:04 -0000)]
When calling scanelf inside LinkageMap.rebuild(), join paths with $ROOT when
generating the arguments and then strip $ROOT from the paths in the output.

svn path=/main/trunk/; revision=11822

16 years agoFix LinkageMap.rebuild() so that the data from include_file overrides the
Zac Medico [Fri, 7 Nov 2008 18:20:57 +0000 (18:20 -0000)]
Fix LinkageMap.rebuild() so that the data from include_file overrides the
data from any previously installed files. This prevent possible corruption
of the data since only one set of data can be correct for a given file.

svn path=/main/trunk/; revision=11821

16 years agoWhen using the `read` builtin to split newlines in e* function arguments, use
Zac Medico [Fri, 7 Nov 2008 16:56:04 +0000 (16:56 -0000)]
When using the `read` builtin to split newlines in e* function arguments, use
$REPLY in order to ensure that whitespace in each line is correctly preserved.
Thanks to Joe Peterson <lavajoe@g.o> for reporting.

svn path=/main/trunk/; revision=11820

16 years agoCombine redundant arch_map code inside LinkageMap.rebuild().
Zac Medico [Fri, 7 Nov 2008 16:23:36 +0000 (16:23 -0000)]
Combine redundant arch_map code inside LinkageMap.rebuild().

svn path=/main/trunk/; revision=11819

16 years agoSwap the locations of the arch and soname keys inside LinkageMap._libs in
Zac Medico [Fri, 7 Nov 2008 16:09:59 +0000 (16:09 -0000)]
Swap the locations of the arch and soname keys inside LinkageMap._libs in
order to conserve memory. This new branching layout uses fewer dict instances
since the number of sonames is much larger than the number of archs.

svn path=/main/trunk/; revision=11818

16 years agoInside LinkageMap._libs, use a SlotDict to store consumers and providers,
Zac Medico [Fri, 7 Nov 2008 15:39:35 +0000 (15:39 -0000)]
Inside LinkageMap._libs, use a SlotDict to store consumers and providers,
to use less memory than a normal dict.

svn path=/main/trunk/; revision=11817

16 years agoBug #245932 - Pass use_mask and use_force parameters into recursive
Zac Medico [Fri, 7 Nov 2008 08:56:55 +0000 (08:56 -0000)]
Bug #245932 - Pass use_mask and use_force parameters into recursive
_expand_new_virtuals() calls, fixing a TypeError which is triggered inside
portage.dep._use_dep._eval_qa_conditionals().

svn path=/main/trunk/; revision=11816

16 years agoRemove the special package.keywords mask warning from bug #223447 since
Zac Medico [Thu, 6 Nov 2008 20:27:03 +0000 (20:27 -0000)]
Remove the special package.keywords mask warning from bug #223447 since
--depclean now uses the depgraph class and therefore should be more
consistent with the update algorithm.

svn path=/main/trunk/; revision=11815

16 years agoBug #245661 - Never enable --complete-graph automatically since it's confusing
Zac Medico [Thu, 6 Nov 2008 20:08:02 +0000 (20:08 -0000)]
Bug #245661 - Never enable --complete-graph automatically since it's confusing
for users.

svn path=/main/trunk/; revision=11814

16 years agoIn Atom.__setattr__(), include inputs in case it helps for debugging with
Zac Medico [Thu, 6 Nov 2008 04:56:17 +0000 (04:56 -0000)]
In Atom.__setattr__(), include inputs in case it helps for debugging with
derived classes. Thanks to Brian Harring for the suggestion.

svn path=/main/trunk/; revision=11813

16 years agoOverride Atom.__setattr__() to make Atom instances immutable. Thanks to Brian
Zac Medico [Wed, 5 Nov 2008 23:55:17 +0000 (23:55 -0000)]
Override Atom.__setattr__() to make Atom instances immutable. Thanks to Brian
Harring for the suggestion.

svn path=/main/trunk/; revision=11812

16 years agoFix broken reference to self inside unmerge().
Zac Medico [Tue, 4 Nov 2008 23:43:38 +0000 (23:43 -0000)]
Fix broken reference to self inside unmerge().

svn path=/main/trunk/; revision=11809

16 years agoSynchronize portage update/restart logic in dblink.merge() and
Zac Medico [Tue, 4 Nov 2008 17:52:04 +0000 (17:52 -0000)]
Synchronize portage update/restart logic in dblink.merge() and
depgraph.display() so it's consistent with Scheduler._is_restart_necessary().
Thanks to Jeremy Olexa <darkside@g.o> for reporting.

svn path=/main/trunk/; revision=11808

16 years agoFree some memory by clearing the LinkageMap cache when it's not needed.
Zac Medico [Tue, 4 Nov 2008 07:55:01 +0000 (07:55 -0000)]
Free some memory by clearing the LinkageMap cache when it's not needed.

svn path=/main/trunk/; revision=11807

16 years agoBug #245362 - Use tuples of (device, inode) for all path comparisons inside
Zac Medico [Tue, 4 Nov 2008 07:40:34 +0000 (07:40 -0000)]
Bug #245362 - Use tuples of (device, inode) for all path comparisons inside
LinkageMap, so that they work regardless of path differences due to symlinked
directories. TODO: Fix other preserve-libs code, such as
dblink._preserve_libs(), to use this approach for path comparisons.

svn path=/main/trunk/; revision=11806

16 years agoBug #245358 - For unsatisfied dependencies, display the parent nodes and the
Zac Medico [Mon, 3 Nov 2008 08:00:07 +0000 (08:00 -0000)]
Bug #245358 - For unsatisfied dependencies, display the parent nodes and the
argument that pulled them in.

svn path=/main/trunk/; revision=11805

16 years agoBug #245356 - Filter POSIXLY_CORRECT from the ebuild environment since it
Zac Medico [Mon, 3 Nov 2008 06:52:57 +0000 (06:52 -0000)]
Bug #245356 - Filter POSIXLY_CORRECT from the ebuild environment since it
breaks stuff.

svn path=/main/trunk/; revision=11804

16 years agoMake metadata.missing and metadata.bad fatal by removing them from the
Zac Medico [Sun, 2 Nov 2008 21:44:28 +0000 (21:44 -0000)]
Make metadata.missing and metadata.bad fatal by removing them from the
qawarnings set. Thanks to Robin H. Johnson <robbat2@g.o> for the suggestion.

svn path=/main/trunk/; revision=11803

16 years agoImport shutil globally.
Zac Medico [Sun, 2 Nov 2008 20:04:30 +0000 (20:04 -0000)]
Import shutil globally.

svn path=/main/trunk/; revision=11802

16 years agoRemove duplicate code inside EbuildFetchPretend._execute().
Zac Medico [Sun, 2 Nov 2008 18:17:33 +0000 (18:17 -0000)]
Remove duplicate code inside EbuildFetchPretend._execute().

svn path=/main/trunk/; revision=11801

16 years agoRemove locking from EbuildFetchPretend since it uses a private temp directory
Zac Medico [Sun, 2 Nov 2008 18:14:00 +0000 (18:14 -0000)]
Remove locking from EbuildFetchPretend since it uses a private temp directory
now (since bug #245231).

svn path=/main/trunk/; revision=11800

16 years agoBug #245231 - Make EbuildFetchPretend use a private temp directory in order
Zac Medico [Sun, 2 Nov 2008 09:05:31 +0000 (09:05 -0000)]
Bug #245231 - Make EbuildFetchPretend use a private temp directory in order
to avoid locking the main one.

svn path=/main/trunk/; revision=11796

16 years agoIn SetConfig.getSetAtoms(), access self.psets directly in order to avoid v2.2_rc13
Zac Medico [Sat, 1 Nov 2008 23:12:59 +0000 (23:12 -0000)]
In SetConfig.getSetAtoms(), access self.psets directly in order to avoid
making a copy and also to avoid potential swallowing of an unexpected
KeyError.

svn path=/main/trunk/; revision=11791

16 years agoIn config.setcpv(), ensure that A and AA aren't in the env dict.
Zac Medico [Sat, 1 Nov 2008 23:02:55 +0000 (23:02 -0000)]
In config.setcpv(), ensure that A and AA aren't in the env dict.

svn path=/main/trunk/; revision=11790

16 years agoIn _validate_deps(), show the ebuild version to clarify which ebuild the
Zac Medico [Sat, 1 Nov 2008 22:59:01 +0000 (22:59 -0000)]
In _validate_deps(), show the ebuild version to clarify which ebuild the
errors belong to.

svn path=/main/trunk/; revision=11789

16 years agoTODO: In case some elf files collide with blocked packages,
Zac Medico [Sat, 1 Nov 2008 22:06:15 +0000 (22:06 -0000)]
TODO: In case some elf files collide with blocked packages,
ensure that NEEDED data from include_file overrides the stale
NEEDED data from the colliding files in the blocked packages.

svn path=/main/trunk/; revision=11788

16 years agoIn Scheduler._calc_resume_list(), use self.pkgsettings instead of the the
Zac Medico [Sat, 1 Nov 2008 21:10:02 +0000 (21:10 -0000)]
In Scheduler._calc_resume_list(), use self.pkgsettings instead of the the
temportary depgraph's.

svn path=/main/trunk/; revision=11787

16 years agoBug #239015 - Disable unmerge operations for EverythingSet/@installed.
Zac Medico [Sat, 1 Nov 2008 17:55:28 +0000 (17:55 -0000)]
Bug #239015 - Disable unmerge operations for EverythingSet/@installed.

svn path=/main/trunk/; revision=11786

16 years agoWhen echoing the emake command, redirect to stderr since otherwise it breaks
Zac Medico [Sat, 1 Nov 2008 10:51:13 +0000 (10:51 -0000)]
When echoing the emake command, redirect to stderr since otherwise it breaks
the gcc ebuild because of the way that the get_make_var() function from
toolchain.eclass is used.

svn path=/main/trunk/; revision=11784

16 years agoRemove broken pickle_write() since it can't possibly be used.
Zac Medico [Sat, 1 Nov 2008 08:48:15 +0000 (08:48 -0000)]
Remove broken pickle_write() since it can't possibly be used.

svn path=/main/trunk/; revision=11783

16 years ago* In fetch(), ensure that pkg_nofetch is never called more than once.
Zac Medico [Sat, 1 Nov 2008 08:32:57 +0000 (08:32 -0000)]
* In fetch(), ensure that pkg_nofetch is never called more than once.
* In _validate_deps(), revert back to using aux_get since the config
  instance does not cache SRC_URI.

svn path=/main/trunk/; revision=11782

16 years agoRemove unnecessary handler for plain "Exception" from lstat() call in
Zac Medico [Sat, 1 Nov 2008 07:22:49 +0000 (07:22 -0000)]
Remove unnecessary handler for plain "Exception" from lstat() call in
dblink.mergeme().

svn path=/main/trunk/; revision=11781

16 years agoAlso call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock
Zac Medico [Sat, 1 Nov 2008 07:09:19 +0000 (07:09 -0000)]
Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock
and loading it for merge or unmerge.

svn path=/main/trunk/; revision=11780

16 years agoExplicitly load the preserved libs registry after obtaining a lock for merge
Zac Medico [Sat, 1 Nov 2008 06:48:51 +0000 (06:48 -0000)]
Explicitly load the preserved libs registry after obtaining a lock for merge
or unmerge, in case the registry has been changed by a parallel emerge
instance.

svn path=/main/trunk/; revision=11779

16 years agoBefore returning from PreservedLibsRegistry.store(), update self._data_orig.
Zac Medico [Sat, 1 Nov 2008 06:40:36 +0000 (06:40 -0000)]
Before returning from PreservedLibsRegistry.store(), update self._data_orig.

svn path=/main/trunk/; revision=11778

16 years agoRename "object" variable to avoid name collision with the builtin class.
Zac Medico [Sat, 1 Nov 2008 05:44:28 +0000 (05:44 -0000)]
Rename "object" variable to avoid name collision with the builtin class.

svn path=/main/trunk/; revision=11777

16 years agoDefine __all__ and remove unused imports.
Zac Medico [Sat, 1 Nov 2008 05:32:30 +0000 (05:32 -0000)]
Define __all__ and remove unused imports.

svn path=/main/trunk/; revision=11776

16 years agoDefine __all__ and remove unused import.
Zac Medico [Sat, 1 Nov 2008 05:28:44 +0000 (05:28 -0000)]
Define __all__ and remove unused import.

svn path=/main/trunk/; revision=11775

16 years agoRemove unused imports.
Zac Medico [Sat, 1 Nov 2008 04:48:42 +0000 (04:48 -0000)]
Remove unused imports.

svn path=/main/trunk/; revision=11774

16 years agoFilter PORTAGE_VERBOSE in save_ebuild_env().
Zac Medico [Sat, 1 Nov 2008 04:00:23 +0000 (04:00 -0000)]
Filter PORTAGE_VERBOSE in save_ebuild_env().

svn path=/main/trunk/; revision=11773

16 years agoBug #240295 - When emake is called, echo the make command similar to the way
Zac Medico [Sat, 1 Nov 2008 03:28:32 +0000 (03:28 -0000)]
Bug #240295 - When emake is called, echo the make command similar to the way
that econf echoes the configure command.

svn path=/main/trunk/; revision=11772

16 years agoBug #241906 - Handle InvalidAtom exception raised from vardbapi.match().
Zac Medico [Sat, 1 Nov 2008 03:14:47 +0000 (03:14 -0000)]
Bug #241906 - Handle InvalidAtom exception raised from vardbapi.match().

svn path=/main/trunk/; revision=11771

16 years agoBug #244792 - Remove confcache support.
Zac Medico [Sat, 1 Nov 2008 02:52:44 +0000 (02:52 -0000)]
Bug #244792 - Remove confcache support.

svn path=/main/trunk/; revision=11770

16 years agoBug #244947 - Add repoman support for checking masked and forced flags on
Zac Medico [Sat, 1 Nov 2008 02:43:56 +0000 (02:43 -0000)]
Bug #244947 - Add repoman support for checking masked and forced flags on
conditional USE deps.

svn path=/main/trunk/; revision=11769

16 years agoBug #244947 - Add basic repoman support for checking masked and forced flags
Zac Medico [Fri, 31 Oct 2008 21:37:18 +0000 (21:37 -0000)]
Bug #244947 - Add basic repoman support for checking masked and forced flags
when verifying USE deps. TODO: Add repoman support in dep_check() for
evaluation of conditional USE deps based on forced/masked flags.
masked flags, so that repoman can also

svn path=/main/trunk/; revision=11768

16 years agoEliminate duplicate code by calling equivalent dblink._clear_contents_cache().
Zac Medico [Fri, 31 Oct 2008 20:40:51 +0000 (20:40 -0000)]
Eliminate duplicate code by calling equivalent dblink._clear_contents_cache().

svn path=/main/trunk/; revision=11767

16 years agoBug #243178 - Handle file collisions with preserved libs by allowing the
Zac Medico [Fri, 31 Oct 2008 20:21:53 +0000 (20:21 -0000)]
Bug #243178 - Handle file collisions with preserved libs by allowing the
current package to assume ownership and unregistering the preserved libraries.

svn path=/main/trunk/; revision=11766

16 years agoIn dblink._collision_protect(), remove redundant self.isowner() calls since
Zac Medico [Fri, 31 Oct 2008 18:49:10 +0000 (18:49 -0000)]
In dblink._collision_protect(), remove redundant self.isowner() calls since
self hasn't yet been merged and therefore has no CONTENTS file for ownership
checks. Also, remove redundant isprotected() calls.

svn path=/main/trunk/; revision=11765

16 years agoBug #236609 - Fix columns calculation for TERM="dumb". Thanks to Ulrich Müller
Zac Medico [Fri, 31 Oct 2008 17:25:44 +0000 (17:25 -0000)]
Bug #236609 - Fix columns calculation for TERM="dumb". Thanks to Ulrich Müller
<ulm@g.o> for the patch.

svn path=/main/trunk/; revision=11764

16 years agoRevert previous commit since it doesn't properly calculate masked and forced
Zac Medico [Fri, 31 Oct 2008 05:07:28 +0000 (05:07 -0000)]
Revert previous commit since it doesn't properly calculate masked and forced
flags for the package being matched (it erroneously uses the masked and forced
flags from the parent package).

svn path=/main/trunk/; revision=11763

16 years agoBug #244947 - Add repoman support for checking masked and forced flags when
Zac Medico [Fri, 31 Oct 2008 04:29:51 +0000 (04:29 -0000)]
Bug #244947 - Add repoman support for checking masked and forced flags when
verifying USE deps. Thanks to Brian Harring for reporting.

svn path=/main/trunk/; revision=11762

16 years agoRemove unused conditional_disabled and conditional_enabled attributes from
Zac Medico [Fri, 31 Oct 2008 04:26:06 +0000 (04:26 -0000)]
Remove unused conditional_disabled and conditional_enabled attributes from
_use_dep.__slots__.

svn path=/main/trunk/; revision=11761

16 years agoFix broken stuff to avoid tracebacks when running in commit mode with
Zac Medico [Fri, 31 Oct 2008 04:01:49 +0000 (04:01 -0000)]
Fix broken stuff to avoid tracebacks when running in commit mode with
--pretend and no vcs.

svn path=/main/trunk/; revision=11760

16 years agoPass a Package instance into the config.setcpv() call.
Zac Medico [Fri, 31 Oct 2008 03:46:22 +0000 (03:46 -0000)]
Pass a Package instance into the config.setcpv() call.

svn path=/main/trunk/; revision=11759

16 years agoUse portage.const.PORTAGE_PACKAGE_ATOM where appropriate.
Zac Medico [Thu, 30 Oct 2008 22:44:55 +0000 (22:44 -0000)]
Use portage.const.PORTAGE_PACKAGE_ATOM where appropriate.

svn path=/main/trunk/; revision=11758

16 years agorecheck what changed in the repository also when nothing was added, because
Zac Medico [Thu, 30 Oct 2008 22:25:27 +0000 (22:25 -0000)]
recheck what changed in the repository also when nothing was added, because
manifest regeneration might change the Manifest, this fixes bug #229033
(branches/prefix r11755)

svn path=/main/trunk/; revision=11757

16 years agoBug #244975 - Don't allow the user to make portage unmerge itself since
Zac Medico [Thu, 30 Oct 2008 22:18:55 +0000 (22:18 -0000)]
Bug #244975 - Don't allow the user to make portage unmerge itself since
there's never any valid reason to do so.

svn path=/main/trunk/; revision=11756

16 years agoMake sure mychanged and mynew are always defined even if there is no vcs
Zac Medico [Thu, 30 Oct 2008 20:33:57 +0000 (20:33 -0000)]
Make sure mychanged and mynew are always defined even if there is no vcs
because commit mode is allowed without a vcs in pretend mode.

svn path=/main/trunk/; revision=11753

16 years agoAvoid unnecessary aux_get calls inside Scheduler._pkg() by getting the existing
Zac Medico [Thu, 30 Oct 2008 20:20:38 +0000 (20:20 -0000)]
Avoid unnecessary aux_get calls inside Scheduler._pkg() by getting the existing
Package instance from the digraph.

svn path=/main/trunk/; revision=11752

16 years agodefine myunadded such that repoman doesn't crash when being run in a
Zac Medico [Thu, 30 Oct 2008 19:54:19 +0000 (19:54 -0000)]
define myunadded such that repoman doesn't crash when being run in a
non-{cvs,svn} dir (branches/prefix r11750)

svn path=/main/trunk/; revision=11751

16 years agoBug #225429 - Inside LinkageMap.rebuild(), update self._defpath since it
Zac Medico [Thu, 30 Oct 2008 07:58:25 +0000 (07:58 -0000)]
Bug #225429 - Inside LinkageMap.rebuild(), update self._defpath since it
can change during a gcc upgrade.

svn path=/main/trunk/; revision=11749

16 years agoBug # 225429 - Try to remove unneeded preserved libs just before returning
Zac Medico [Thu, 30 Oct 2008 07:46:32 +0000 (07:46 -0000)]
Bug # 225429 - Try to remove unneeded preserved libs just before returning
from dblink.treewalk(), after the library path has been updated. This is
intended to remove unneeded preserved libs after a gcc upgrade. TODO: Figure
out why libgomp.so.1 still isn't properly removed.

svn path=/main/trunk/; revision=11748

16 years agoIn dblink.unmerge(), update the CONTENTS entries when preserved libs are
Zac Medico [Thu, 30 Oct 2008 03:37:55 +0000 (03:37 -0000)]
In dblink.unmerge(), update the CONTENTS entries when preserved libs are
removed.

svn path=/main/trunk/; revision=11747

16 years agoBug #225429 - In dblink.unmerge(), eliminate consumers having providers with
Zac Medico [Thu, 30 Oct 2008 03:04:08 +0000 (03:04 -0000)]
Bug #225429 - In dblink.unmerge(), eliminate consumers having providers with
the same soname as an installed library that is not preserved. This eliminates
libraries that are erroneously preserved due to a move from one directory to
another.

svn path=/main/trunk/; revision=11746