portage.git
14 years agoFix a typo in a comment. v2.2_rc90
Zac Medico [Wed, 6 Oct 2010 20:38:28 +0000 (13:38 -0700)]
Fix a typo in a comment.

14 years agoInclude gpg key in repoman commit message.
Zac Medico [Wed, 6 Oct 2010 20:27:27 +0000 (13:27 -0700)]
Include gpg key in repoman commit message.

14 years agoOptimize slot conflict backtracking for #337178.
Zac Medico [Wed, 6 Oct 2010 20:13:16 +0000 (13:13 -0700)]
Optimize slot conflict backtracking for #337178.

This borrows logic from commit
fc33f34e3d060b57e03204fb427b01971f8dafff which fixes bug #337178
in the 2.1.9 branch. With this change,
BacktrackingTestCase.testBacktrackingGoodVersionFirst() is solved
with one less backtracking step.

14 years agoAdd fallback backtrack_data, in case logic fails.
Zac Medico [Wed, 6 Oct 2010 19:33:26 +0000 (12:33 -0700)]
Add fallback backtrack_data, in case logic fails.

This adds some safety in the depgraph._add_pkg() slot conflict code,
in case the new logic fails somehow (it shouldn't, but given all
the complexities, who knows?). Also, add some more debug output.

14 years agoBacktracker reverses backtrack_data now.
Zac Medico [Wed, 6 Oct 2010 18:37:36 +0000 (11:37 -0700)]
Backtracker reverses backtrack_data now.

Since commit 9ff5e9731142d389373ea6ebc949919c3b637110,
Backtracker._feedback_slot_conflict() adds nodes in the order
of backtrack_data and this order is then reversed when the
nodes are popped from _unexplored_nodes.

14 years agoTest that SLOT deps don't rebuild multislot.
Zac Medico [Wed, 6 Oct 2010 15:32:54 +0000 (08:32 -0700)]
Test that SLOT deps don't rebuild multislot.

14 years agoRemove unused variable.
Zac Medico [Wed, 6 Oct 2010 06:55:02 +0000 (23:55 -0700)]
Remove unused variable.

14 years agoFix _iter_match_pkgs installed multislot breakage
Zac Medico [Wed, 6 Oct 2010 06:50:28 +0000 (23:50 -0700)]
Fix _iter_match_pkgs installed multislot breakage

14 years agoUse Atom.without_use in _show_unsatisfied_dep().
Zac Medico [Wed, 6 Oct 2010 06:24:06 +0000 (23:24 -0700)]
Use Atom.without_use in _show_unsatisfied_dep().

14 years agoFix 'repository' KeyError in Package constructor.
Zac Medico [Wed, 6 Oct 2010 05:43:51 +0000 (22:43 -0700)]
Fix 'repository' KeyError in Package constructor.

14 years agoEnsure valid Package.metadata['repository'].
Zac Medico [Wed, 6 Oct 2010 05:35:29 +0000 (22:35 -0700)]
Ensure valid Package.metadata['repository'].

14 years agoUse match-all-cpv-only in _show_unsatisfied_dep.
Zac Medico [Wed, 6 Oct 2010 04:01:08 +0000 (21:01 -0700)]
Use match-all-cpv-only in _show_unsatisfied_dep.

14 years agoHandle negated atoms in getmaskingreason().
Zac Medico [Wed, 6 Oct 2010 03:59:52 +0000 (20:59 -0700)]
Handle negated atoms in getmaskingreason().

14 years agoFix ebuild(1) to handle layout.conf masters.
Zac Medico [Wed, 6 Oct 2010 03:06:04 +0000 (20:06 -0700)]
Fix ebuild(1) to handle layout.conf masters.

14 years agoMake --info repo display brief, unless --verbose.
Zac Medico [Wed, 6 Oct 2010 02:48:44 +0000 (19:48 -0700)]
Make --info repo display brief, unless --verbose.

14 years agoOptimize xmatch match-all-cpv-only for repo deps.
Zac Medico [Wed, 6 Oct 2010 01:46:06 +0000 (18:46 -0700)]
Optimize xmatch match-all-cpv-only for repo deps.

14 years agoDon't allow_wildcard in _iter_match_pkgs.
Zac Medico [Tue, 5 Oct 2010 22:33:56 +0000 (15:33 -0700)]
Don't allow_wildcard in _iter_match_pkgs.

14 years agoEnsure that Package.repo is always valid.
Zac Medico [Tue, 5 Oct 2010 22:14:10 +0000 (15:14 -0700)]
Ensure that Package.repo is always valid.

14 years agoAdd _gen_valid_repo() to ensure valid repo name.
Zac Medico [Tue, 5 Oct 2010 22:10:28 +0000 (15:10 -0700)]
Add _gen_valid_repo() to ensure valid repo name.

14 years agoMask packages that don't satisfy all atoms.
Sebastian Luther [Tue, 5 Oct 2010 18:05:32 +0000 (20:05 +0200)]
Mask packages that don't satisfy all atoms.

This also fixes a logic error in resolver/backtracking/Backtracker._feedback_slot_conflict()

14 years agoShow status when listing pkgs for emerge --regen.
Zac Medico [Tue, 5 Oct 2010 15:37:22 +0000 (08:37 -0700)]
Show status when listing pkgs for emerge --regen.

14 years agoFix _show_unsatisfied_dep to pass repo to _pkg().
Zac Medico [Tue, 5 Oct 2010 03:44:04 +0000 (20:44 -0700)]
Fix _show_unsatisfied_dep to pass repo to _pkg().

14 years agoAdd note about depgraph/portdbapi caching.
Zac Medico [Tue, 5 Oct 2010 03:29:10 +0000 (20:29 -0700)]
Add note about depgraph/portdbapi caching.

14 years agoOptimize depgraph/portdbapi cache handling.
Zac Medico [Tue, 5 Oct 2010 03:14:17 +0000 (20:14 -0700)]
Optimize depgraph/portdbapi cache handling.

14 years agoSkip redundant cpv_exists in _iter_match_pkgs().
Zac Medico [Tue, 5 Oct 2010 02:29:45 +0000 (19:29 -0700)]
Skip redundant cpv_exists in _iter_match_pkgs().

14 years agoClarify repo code in depgraph._pkg().
Zac Medico [Tue, 5 Oct 2010 01:56:54 +0000 (18:56 -0700)]
Clarify repo code in depgraph._pkg().

14 years agoCache InternalPackageSet in _iter_match_pkgs().
Zac Medico [Tue, 5 Oct 2010 01:45:45 +0000 (18:45 -0700)]
Cache InternalPackageSet in _iter_match_pkgs().

14 years agoAdd missing myrepo keyword in findname call.
Zac Medico [Tue, 5 Oct 2010 01:29:29 +0000 (18:29 -0700)]
Add missing myrepo keyword in findname call.

14 years agoAdd back --sync IPv4/IPv6 override support.
Zac Medico [Mon, 4 Oct 2010 22:11:11 +0000 (15:11 -0700)]
Add back --sync IPv4/IPv6 override support.

14 years agoClean up repo handling for depgraph pkg_cache.
Zac Medico [Mon, 4 Oct 2010 22:00:49 +0000 (15:00 -0700)]
Clean up repo handling for depgraph pkg_cache.

14 years agoFix undefined name 'output_mode'.
Zac Medico [Mon, 4 Oct 2010 20:28:47 +0000 (13:28 -0700)]
Fix undefined name 'output_mode'.

14 years agoOptimize slot conflict backtracking for #337178.
Zac Medico [Mon, 4 Oct 2010 20:12:38 +0000 (13:12 -0700)]
Optimize slot conflict backtracking for #337178.

This borrows logic from commit
fc33f34e3d060b57e03204fb427b01971f8dafff which fixes bug #337178
in the 2.1.9 branch. With this change,
BacktrackingTestCase.testBacktrackingGoodVersionFirst() is solved
with fewer backtracking steps.

14 years agoBug #339642 - Use AF_UNSPEC for --sync addresses.
Zac Medico [Mon, 4 Oct 2010 19:29:09 +0000 (12:29 -0700)]
Bug #339642 - Use AF_UNSPEC for --sync addresses.

14 years agoegencache: Sort file names for ChangeLog
Sebastian Luther [Mon, 4 Oct 2010 18:41:28 +0000 (20:41 +0200)]
egencache: Sort file names for ChangeLog

14 years agoBug #339642 - Make --sync try all addresses.
Zac Medico [Mon, 4 Oct 2010 18:40:23 +0000 (11:40 -0700)]
Bug #339642 - Make --sync try all addresses.

14 years agoNote curious testBacktrackMissedUpdates() failure
Zac Medico [Mon, 4 Oct 2010 02:26:22 +0000 (19:26 -0700)]
Note curious testBacktrackMissedUpdates() failure

14 years agoAdd a backtracking test for 'missed updates'.
Zac Medico [Mon, 4 Oct 2010 01:25:03 +0000 (18:25 -0700)]
Add a backtracking test for 'missed updates'.

14 years agoBug #339606 - Fix broken 'missed update' message.
Zac Medico [Mon, 4 Oct 2010 01:05:48 +0000 (18:05 -0700)]
Bug #339606 - Fix broken 'missed update' message.

14 years agoegencache --update-changelogs: write if needed
Michał Górny [Sun, 3 Oct 2010 18:28:11 +0000 (20:28 +0200)]
egencache --update-changelogs: write if needed

Compare the last commit timestamp with the ChangeLog file timestamp to
guess whether a particular ChangeLog needs updating.

14 years agoegencache --update-changelogs: Filter messages
Michał Górny [Sun, 3 Oct 2010 17:21:10 +0000 (19:21 +0200)]
egencache --update-changelogs: Filter messages

Drop common commit message suffixes like 'git-svn-id' and repoman
version note.

14 years agoegencache --update-changelogs: escape CP regexp
Michał Górny [Sun, 3 Oct 2010 17:02:55 +0000 (19:02 +0200)]
egencache --update-changelogs: escape CP regexp

14 years agoHandle invalid PORTDIR and realpath issues
Sebastian Luther [Sun, 3 Oct 2010 18:04:35 +0000 (20:04 +0200)]
Handle invalid PORTDIR and realpath issues

14 years agoInclude repo info in emerge --info
Sebastian Luther [Sun, 3 Oct 2010 17:54:23 +0000 (19:54 +0200)]
Include repo info in emerge --info

14 years agoegencache --update-changelogs: don't break change list on hyphens.
Michał Górny [Sun, 3 Oct 2010 08:34:51 +0000 (10:34 +0200)]
egencache --update-changelogs: don't break change list on hyphens.

14 years agoegencache --update-changelogs: strip leading CP from the log messages.
Michał Górny [Sun, 3 Oct 2010 08:10:16 +0000 (10:10 +0200)]
egencache --update-changelogs: strip leading CP from the log messages.

14 years agoTODO: Make elog 'key' parameter more unique.
Zac Medico [Sun, 3 Oct 2010 07:57:35 +0000 (00:57 -0700)]
TODO: Make elog 'key' parameter more unique.

14 years agoMake Atom.with_repo() allow wildcard.
Zac Medico [Sun, 3 Oct 2010 00:32:34 +0000 (17:32 -0700)]
Make Atom.with_repo() allow wildcard.

14 years agoFix repo atom breakage in getmaskingreason().
Zac Medico [Sun, 3 Oct 2010 00:19:24 +0000 (17:19 -0700)]
Fix repo atom breakage in getmaskingreason().

14 years agoDon't call metadata.get() if metadata is None.
Zac Medico [Sun, 3 Oct 2010 00:09:44 +0000 (17:09 -0700)]
Don't call metadata.get() if metadata is None.

14 years agoAdd support for 'egencache --update-changelogs'.
Michał Górny [Sat, 2 Oct 2010 20:57:16 +0000 (22:57 +0200)]
Add support for 'egencache --update-changelogs'.

14 years agoPrune circular nested sets from the digraph.
Zac Medico [Sat, 2 Oct 2010 20:49:08 +0000 (13:49 -0700)]
Prune circular nested sets from the digraph.

This prevents the following traceback which was reported in forum
thread 847007:

  File "pym/_emerge/depgraph.py", line 3694, in _merge_order_bias
    mygraph.order.sort(key=cmp_sort_key(cmp_merge_preference))
  File "pym/portage/util/__init__.py", line 808, in __lt__
    return self._cmp_func(self._obj, other._obj) < 0
  File "pym/_emerge/depgraph.py", line 3675, in cmp_merge_preference
    if node1.operation == 'uninstall':
AttributeError: 'SetArg' object has no attribute 'operation'

14 years agoTweak elog message order so python comes first.
Zac Medico [Sat, 2 Oct 2010 17:24:07 +0000 (10:24 -0700)]
Tweak elog message order so python comes first.

14 years agoBug #339402 - Ensure valid repo name.
Zac Medico [Sat, 2 Oct 2010 17:00:18 +0000 (10:00 -0700)]
Bug #339402 - Ensure valid repo name.

14 years agoEnsure repo in atom matches PMS 3.1.5.
Zac Medico [Sat, 2 Oct 2010 16:33:28 +0000 (09:33 -0700)]
Ensure repo in atom matches PMS 3.1.5.

14 years agoBug #339402 - Prevent whitespace in repo names.
Zac Medico [Sat, 2 Oct 2010 16:13:37 +0000 (09:13 -0700)]
Bug #339402 - Prevent whitespace in repo names.

14 years agoFix action_config() broken vardbapi.findname().
Zac Medico [Sat, 2 Oct 2010 16:03:24 +0000 (09:03 -0700)]
Fix action_config() broken vardbapi.findname().

14 years agoAvoid 'Unavailable repository' with aliases.
Zac Medico [Fri, 1 Oct 2010 20:27:05 +0000 (13:27 -0700)]
Avoid 'Unavailable repository' with aliases.

14 years agoFix broken SafeConfigParser.Error reference.
Zac Medico [Fri, 1 Oct 2010 19:58:09 +0000 (12:58 -0700)]
Fix broken SafeConfigParser.Error reference.

14 years agoSupport documented repos.conf settings.
Zac Medico [Fri, 1 Oct 2010 19:25:57 +0000 (12:25 -0700)]
Support documented repos.conf settings.

Support for aliases, eclass-overrides, and masters from
/etc/portage/repos.conf, as documented in the portage.5 man page, has
been absent since we switched to using the RepoConfigLoader class.
This commit is intended to bring feature parity with repos.conf
support in previous releases.

14 years agoHandle user_location in RepoConfig.update().
Zac Medico [Fri, 1 Oct 2010 18:38:27 +0000 (11:38 -0700)]
Handle user_location in RepoConfig.update().

14 years agoFix typo in 'masters' variable name.
Zac Medico [Fri, 1 Oct 2010 15:28:07 +0000 (08:28 -0700)]
Fix typo in 'masters' variable name.

14 years agoFix misspelling of masters.split() as plit().
Zac Medico [Fri, 1 Oct 2010 15:15:38 +0000 (08:15 -0700)]
Fix misspelling of masters.split() as plit().

14 years agoFix spelling of depclean test methods.
Zac Medico [Fri, 1 Oct 2010 14:54:51 +0000 (07:54 -0700)]
Fix spelling of depclean test methods.

14 years agoUse _pkg_visibility_check in _loadResumeCommand.
Zac Medico [Fri, 1 Oct 2010 14:42:02 +0000 (07:42 -0700)]
Use _pkg_visibility_check in _loadResumeCommand.

14 years agoEnable depgraph._load_vdb() with --buildpkgonly.
Zac Medico [Fri, 1 Oct 2010 14:25:49 +0000 (07:25 -0700)]
Enable depgraph._load_vdb() with --buildpkgonly.

The --buildpkgonly option does not negate the need for _load_vdb(),
at least not with the --resume option since otherwise the
select_pkg_from_graph() method fails to select installed packages.

14 years agoBug #339316 - Fix --resume to handle repo masks.
Zac Medico [Fri, 1 Oct 2010 14:18:19 +0000 (07:18 -0700)]
Bug #339316 - Fix --resume to handle repo masks.

14 years agoFix reversed porttrees findname2/findLicensePath.
Zac Medico [Fri, 1 Oct 2010 04:22:49 +0000 (21:22 -0700)]
Fix reversed porttrees findname2/findLicensePath.

14 years agoFix broken/reversed order of portdbapi.porttrees.
Zac Medico [Fri, 1 Oct 2010 04:01:36 +0000 (21:01 -0700)]
Fix broken/reversed order of portdbapi.porttrees.

14 years agoAllow missing category with depclean --exclude.
Zac Medico [Fri, 1 Oct 2010 02:45:01 +0000 (19:45 -0700)]
Allow missing category with depclean --exclude.

14 years agoBug #339231 - Return unicode from glsa.getText().
Zac Medico [Fri, 1 Oct 2010 02:03:12 +0000 (19:03 -0700)]
Bug #339231 - Return unicode from glsa.getText().

14 years agoDeprecate spawnebuild() with returnpid.
Zac Medico [Fri, 1 Oct 2010 01:21:56 +0000 (18:21 -0700)]
Deprecate spawnebuild() with returnpid.

14 years agoDeprecate doebuild() with returnpid.
Zac Medico [Fri, 1 Oct 2010 01:17:32 +0000 (18:17 -0700)]
Deprecate doebuild() with returnpid.

14 years agoSimplify Task.__eq__() and __ne__().
Zac Medico [Thu, 30 Sep 2010 22:58:36 +0000 (15:58 -0700)]
Simplify Task.__eq__() and __ne__().

Supposedly performance it better with the simpler implementation.
This reverts commit 59f50a0bf9bdbb3aab4eee097e12bf32eeb12274.

14 years agoMake _RepoDisplay show user_location.
Zac Medico [Thu, 30 Sep 2010 22:57:15 +0000 (15:57 -0700)]
Make _RepoDisplay show user_location.

14 years agoFix findLicensePath() breakage from previous.
Zac Medico [Thu, 30 Sep 2010 22:45:07 +0000 (15:45 -0700)]
Fix findLicensePath() breakage from previous.

14 years agoMake portdbapi.porttrees mutable once again.
Zac Medico [Thu, 30 Sep 2010 22:13:20 +0000 (15:13 -0700)]
Make portdbapi.porttrees mutable once again.

The portdbapi.porttrees needs to be mutable for repoman, probably
some external api consumers. It's somewhat invasive to modify it,
but it's also quite useful.

14 years agoMore repository handling cleanup
Sebastian Luther [Thu, 30 Sep 2010 10:36:37 +0000 (12:36 +0200)]
More repository handling cleanup

14 years agoRemove repos.conf handling from package/ebuild/config.py because it moved to reposito...
Sebastian Luther [Thu, 30 Sep 2010 06:13:03 +0000 (08:13 +0200)]
Remove repos.conf handling from package/ebuild/config.py because it moved to repository/config.py

14 years agoFix readonly variable assignment for PORTAGE_BINPKG_TMPFILE when
Zac Medico [Thu, 30 Sep 2010 19:04:25 +0000 (12:04 -0700)]
Fix readonly variable assignment for PORTAGE_BINPKG_TMPFILE when
ebuild(1) calls the 'package' phase.

14 years agoHandle missing PORTDIR in RepoConfigLoader.mainRepo() and the
Zac Medico [Wed, 29 Sep 2010 20:56:46 +0000 (13:56 -0700)]
Handle missing PORTDIR in RepoConfigLoader.mainRepo() and the
MaskManager constructor.

14 years agoTweak depgraph._show_unsatisfied_dep() display for AtomArg instances.
Zac Medico [Wed, 29 Sep 2010 20:43:08 +0000 (13:43 -0700)]
Tweak depgraph._show_unsatisfied_dep() display for AtomArg instances.

14 years agoremove double prefix in LinkageMapELF
Fabian Groffen [Wed, 29 Sep 2010 19:07:28 +0000 (21:07 +0200)]
remove double prefix in LinkageMapELF

14 years agoAdd missing remember_source_file=True parameter to append_repo() call in the MaskMana...
Zac Medico [Wed, 29 Sep 2010 17:11:57 +0000 (10:11 -0700)]
Add missing remember_source_file=True parameter to append_repo() call in the MaskManager constructor.

14 years agoInvert portageq list_preserved_libs returncode meaning.
Zac Medico [Wed, 29 Sep 2010 15:57:50 +0000 (08:57 -0700)]
Invert portageq list_preserved_libs returncode meaning.

Thanks to Jeremy Olexa <darkside@g.o> for the suggestion.

14 years agosearch: code clean up
Sebastian Luther [Wed, 29 Sep 2010 07:12:46 +0000 (09:12 +0200)]
search: code clean up

14 years agoentries from preserved registry already include EPREFIX, so don't use EROOT on them
Fabian Groffen [Wed, 29 Sep 2010 11:43:37 +0000 (13:43 +0200)]
entries from preserved registry already include EPREFIX, so don't use EROOT on them

14 years agouse ROOT iso EROOT with PreservedLibsRegistry, since all entries already have EPREFIX
Fabian Groffen [Wed, 29 Sep 2010 11:35:31 +0000 (13:35 +0200)]
use ROOT iso EROOT with PreservedLibsRegistry, since all entries already have EPREFIX

14 years agouse ROOT, not EROOT so we don't get a double prefix
Fabian Groffen [Wed, 29 Sep 2010 11:25:37 +0000 (13:25 +0200)]
use ROOT, not EROOT so we don't get a double prefix

14 years agouse ROOT, not EROOT so we don't get a double prefix
Fabian Groffen [Wed, 29 Sep 2010 11:19:08 +0000 (13:19 +0200)]
use ROOT, not EROOT so we don't get a double prefix

14 years agoFix RepoConfigLoader so that it's possible to use PORTDIR_OVERLAY
Zac Medico [Tue, 28 Sep 2010 19:59:13 +0000 (12:59 -0700)]
Fix RepoConfigLoader so that it's possible to use PORTDIR_OVERLAY
to override the repo that PORTDIR refers to.

This fixes a regression which prevented a common repoman use case
from working in which the user has PORTDIR refering to a rsync
tree and has a separate cvs tree with the same repo_name as
PORTDIR. When the user tries to use repoman with the cvs tree,
the cvs repo is appended to PORTDIR_OVERLAY and we want it to
override the conflicting PORTDIR setting.

14 years agoFix a typo in a comment.
Zac Medico [Tue, 28 Sep 2010 18:47:57 +0000 (11:47 -0700)]
Fix a typo in a comment.

14 years agoFix breakage (from reposyntax branch) in repoman's ability to append
Zac Medico [Tue, 28 Sep 2010 18:46:00 +0000 (11:46 -0700)]
Fix breakage (from reposyntax branch) in repoman's ability to append
the current repo to PORTDIR_OVERLAY.

14 years agoGet --exclude to work with --depclean and --prune
Sebastian Luther [Tue, 28 Sep 2010 13:14:01 +0000 (15:14 +0200)]
Get --exclude to work with --depclean and --prune

Thanks to forum member 'krinn' for the suggestion

14 years agoAdd basic repo atom support for emerge --resume.
Zac Medico [Tue, 28 Sep 2010 10:32:09 +0000 (03:32 -0700)]
Add basic repo atom support for emerge --resume.

14 years agoFix breakage in depgraph._serialize_tasks() blocker handling due
Zac Medico [Mon, 27 Sep 2010 23:55:53 +0000 (16:55 -0700)]
Fix breakage in depgraph._serialize_tasks() blocker handling due
to addition of repo to Package._hash_key.

14 years agoFix depgraph._pkg() to not raise PackageNotFound when myrepo is None
Zac Medico [Mon, 27 Sep 2010 22:17:14 +0000 (15:17 -0700)]
Fix depgraph._pkg() to not raise PackageNotFound when myrepo is None
and a package is found, so --resume works.

14 years agoOmit repo from mtimedb resume mergelist entries since the format
Zac Medico [Mon, 27 Sep 2010 21:43:18 +0000 (14:43 -0700)]
Omit repo from mtimedb resume mergelist entries since the format
is intended to be frozen.

14 years agoFix Task.__eq__() and __ne__() to explicitly compare the results
Zac Medico [Mon, 27 Sep 2010 21:13:30 +0000 (14:13 -0700)]
Fix Task.__eq__() and __ne__() to explicitly compare the results
from _get_hash_key().

14 years agodoman: ${mandir} can't contain complete suffix so don't check for it.
Michał Górny [Mon, 27 Sep 2010 18:24:45 +0000 (20:24 +0200)]
doman: ${mandir} can't contain complete suffix so don't check for it.

We're appending only a single character of manfile suffix to ${mandir},
so we don't need to expect having anything more in there.

14 years agoUse realpath for portdbapi._repository_map and treemap since that's
Zac Medico [Mon, 27 Sep 2010 18:53:58 +0000 (11:53 -0700)]
Use realpath for portdbapi._repository_map and treemap since that's
how it was before the reposyntax branch was merged.