Zac Medico [Wed, 6 Oct 2010 20:27:27 +0000 (13:27 -0700)]
Include gpg key in repoman commit message.
Zac Medico [Thu, 7 Oct 2010 00:20:09 +0000 (17:20 -0700)]
Merge slot conflict backtracking from master.
This include the ability to mask packages that don't satisfy all
parent atoms, from commit
9ff5e9731142d389373ea6ebc949919c3b637110.
Zac Medico [Wed, 6 Oct 2010 15:32:54 +0000 (08:32 -0700)]
Test that SLOT deps don't rebuild multislot.
Zac Medico [Wed, 6 Oct 2010 06:55:02 +0000 (23:55 -0700)]
Remove unused variable.
Zac Medico [Wed, 6 Oct 2010 06:50:28 +0000 (23:50 -0700)]
Fix _iter_match_pkgs installed multislot breakage
Zac Medico [Wed, 6 Oct 2010 06:24:06 +0000 (23:24 -0700)]
Use Atom.without_use in _show_unsatisfied_dep().
Zac Medico [Wed, 6 Oct 2010 03:59:52 +0000 (20:59 -0700)]
Handle negated atoms in getmaskingreason().
Zac Medico [Wed, 6 Oct 2010 03:06:04 +0000 (20:06 -0700)]
Fix ebuild(1) to handle layout.conf masters.
Zac Medico [Tue, 5 Oct 2010 15:37:22 +0000 (08:37 -0700)]
Show status when listing pkgs for emerge --regen.
Zac Medico [Mon, 4 Oct 2010 22:11:11 +0000 (15:11 -0700)]
Add back --sync IPv4/IPv6 override support.
Zac Medico [Mon, 4 Oct 2010 20:28:47 +0000 (13:28 -0700)]
Fix undefined name 'output_mode'.
Zac Medico [Mon, 4 Oct 2010 19:29:09 +0000 (12:29 -0700)]
Bug #339642 - Use AF_UNSPEC for --sync addresses.
Sebastian Luther [Mon, 4 Oct 2010 18:41:28 +0000 (20:41 +0200)]
egencache: Sort file names for ChangeLog
Zac Medico [Mon, 4 Oct 2010 18:40:23 +0000 (11:40 -0700)]
Bug #339642 - Make --sync try all addresses.
Zac Medico [Mon, 4 Oct 2010 01:25:03 +0000 (18:25 -0700)]
Add a backtracking test for 'missed updates'.
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.
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.
Michał Górny [Sun, 3 Oct 2010 17:02:55 +0000 (19:02 +0200)]
egencache --update-changelogs: escape CP regexp
Michał Górny [Sun, 3 Oct 2010 08:34:51 +0000 (10:34 +0200)]
egencache --update-changelogs: don't break change list on hyphens.
Michał Górny [Sun, 3 Oct 2010 08:10:16 +0000 (10:10 +0200)]
egencache --update-changelogs: strip leading CP from the log messages.
Zac Medico [Sun, 3 Oct 2010 07:57:35 +0000 (00:57 -0700)]
TODO: Make elog 'key' parameter more unique.
Zac Medico [Sun, 3 Oct 2010 00:32:34 +0000 (17:32 -0700)]
Make Atom.with_repo() allow wildcard.
Zac Medico [Sun, 3 Oct 2010 00:19:24 +0000 (17:19 -0700)]
Fix repo atom breakage in getmaskingreason().
Michał Górny [Sat, 2 Oct 2010 20:57:16 +0000 (22:57 +0200)]
Add support for 'egencache --update-changelogs'.
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'
Zac Medico [Sat, 2 Oct 2010 17:24:07 +0000 (10:24 -0700)]
Tweak elog message order so python comes first.
Zac Medico [Sat, 2 Oct 2010 16:33:28 +0000 (09:33 -0700)]
Ensure repo in atom matches PMS 3.1.5.
Zac Medico [Fri, 1 Oct 2010 14:54:51 +0000 (07:54 -0700)]
Fix spelling of depclean test methods.
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.
Zac Medico [Fri, 1 Oct 2010 04:37:23 +0000 (21:37 -0700)]
Merge findname2/findLicensePath diff from master.
Zac Medico [Fri, 1 Oct 2010 02:45:01 +0000 (19:45 -0700)]
Allow missing category with depclean --exclude.
Zac Medico [Fri, 1 Oct 2010 02:03:12 +0000 (19:03 -0700)]
Bug #339231 - Return unicode from glsa.getText().
Zac Medico [Fri, 1 Oct 2010 01:21:56 +0000 (18:21 -0700)]
Deprecate spawnebuild() with returnpid.
Zac Medico [Fri, 1 Oct 2010 01:17:32 +0000 (18:17 -0700)]
Deprecate doebuild() with returnpid.
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.
Zac Medico [Wed, 29 Sep 2010 20:43:08 +0000 (13:43 -0700)]
Tweak depgraph._show_unsatisfied_dep() display for AtomArg instances.
Fabian Groffen [Wed, 29 Sep 2010 19:07:28 +0000 (21:07 +0200)]
remove double prefix in LinkageMapELF
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.
Sebastian Luther [Wed, 29 Sep 2010 07:12:46 +0000 (09:12 +0200)]
search: code clean up
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
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
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
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
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
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.
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.
Zac Medico [Mon, 27 Sep 2010 20:45:35 +0000 (13:45 -0700)]
Merge additional backtracking tests from the master branch.
Zac Medico [Mon, 27 Sep 2010 16:49:06 +0000 (09:49 -0700)]
Bug #337178 - Fix slot conflict backtracking to mask the higher
version if appropriate.
Generally, we mask the higher version since this solves common
cases in which a lower version is needed so that all dependencies
will be satisfied (bug #337178). However, if existing_node happens
to be installed then we mask that since this is a common case that
is triggered when --update is not enabled.
Zac Medico [Wed, 8 Sep 2010 01:52:13 +0000 (18:52 -0700)]
Remove --depclean-lib-check docs from the man/emerge.1 since it's not supported in the stable branch.
Zac Medico [Thu, 2 Sep 2010 20:55:59 +0000 (13:55 -0700)]
Adjust package sets documentation to match behavior in the stable branch.
Zac Medico [Thu, 2 Sep 2010 20:55:24 +0000 (13:55 -0700)]
Add warnings advising use of revdep-rebuild in --depclean documentation since _ENABLE_DYN_LINK_MAP is False in the stable branch.
Zac Medico [Thu, 2 Sep 2010 20:54:44 +0000 (13:54 -0700)]
Remove documentation for FEATURES=preserve-libs since it's not supported in the stable branch.
Zac Medico [Thu, 2 Sep 2010 20:54:05 +0000 (13:54 -0700)]
Comment out the FEATURES=preserve-libs setting in make.globals since it's not supported in the stable branch.
Zac Medico [Thu, 2 Sep 2010 20:52:23 +0000 (13:52 -0700)]
Toggle private constants for stable branch:
_ENABLE_DYN_LINK_MAP = False
_ENABLE_PRESERVE_LIBS = False
_ENABLE_REPO_NAME_WARN = False
_ENABLE_SET_CONFIG = False
_SANDBOX_COMPAT_LEVEL = "16"
Zac Medico [Mon, 27 Sep 2010 05:52:52 +0000 (22:52 -0700)]
Revert one more change from bug #337178: parent_atoms is supposed
to refer to the new pkg, not the one to_be_masked.
Zac Medico [Mon, 27 Sep 2010 05:37:04 +0000 (22:37 -0700)]
Revert slot conflict behavior backtracking behavior changes from
bug #337178 and comment about reasoning for behavior.
We always mask existing_node since _select_package tries to avoid
slot conflicts when possible and therefore a conflict typically
means that existing_node was a poor choice.
Zac Medico [Sun, 26 Sep 2010 13:43:17 +0000 (06:43 -0700)]
Fix confusing messages shown by
depgraph._show_missed_update_slot_conflicts() since the fix from
bug #337178.
When depgraph._add_pkg() was fixed to mask the higher version in
4bc78ab0b563697b98527eebcdfe474863383cf0, we didn't adjust the
parent_atoms variable so that it would contain parent atoms from
the versions being masked. This resulted in confusing messages from
depgraph._show_missed_update_slot_conflicts().
Zac Medico [Sun, 26 Sep 2010 01:31:38 +0000 (18:31 -0700)]
Add PORTAGE_BINHOST sftp protocol support.
Zac Medico [Sun, 26 Sep 2010 00:51:07 +0000 (17:51 -0700)]
Fix a typo in a comment.
Zac Medico [Sat, 25 Sep 2010 23:43:10 +0000 (16:43 -0700)]
Add non-essential backslashes for clarity in GetConfigTestCase.
Zac Medico [Sat, 25 Sep 2010 23:40:01 +0000 (16:40 -0700)]
Add test cases for getconfig() bash compatibility with variables
from make.globals.
Zac Medico [Sat, 25 Sep 2010 22:05:22 +0000 (15:05 -0700)]
Add default values for FETCHCOMMAND_SSH and RESUMECOMMAND_SSH
that call rsync.
Zac Medico [Sat, 25 Sep 2010 21:56:05 +0000 (14:56 -0700)]
Fix varexpand() so that it doesn't do redundant quote removal that
is already handled by shlex.
This fixes a bug in getconfig() which caused it to remove backslash
characters it front of quote characters in cases where bash would
have preserved them when sourcing the same input.
Zac Medico [Sat, 25 Sep 2010 20:55:46 +0000 (13:55 -0700)]
Fix BinpkgVerifier so that it doesn't try to rename the file if
it doesn't exist.
Zac Medico [Sat, 25 Sep 2010 20:13:50 +0000 (13:13 -0700)]
Make MetaDataXML.format_maintainer_string() check a values to make
sure they are non-empty and not just whitespace.
Zac Medico [Sat, 25 Sep 2010 15:53:20 +0000 (08:53 -0700)]
Implement PORTAGE_BINHOST ssh:// protocol support by spawning ssh
and using it to stream the Packages file on stdout.
This assumes that you have ssh-agent running, for authentication.
For now, you won't be able to use this unless you define your own
FETCHCOMMAND_SSH and RESUMECOMMAND_SSH values. It's trivial to do
this if you create a helper script that calls rsync after
transforming the URI into the host:/path format that rsync uses.
Zac Medico [Sat, 25 Sep 2010 15:30:19 +0000 (08:30 -0700)]
In EbuildPhase, don't display Repository if the value is not available.
Zac Medico [Sat, 25 Sep 2010 14:16:22 +0000 (07:16 -0700)]
Move all imports in bintree.py to the top.
Zac Medico [Sat, 25 Sep 2010 13:30:11 +0000 (06:30 -0700)]
Make BinpkgFetcher use AsynchronousLock.
Zac Medico [Sat, 25 Sep 2010 10:10:42 +0000 (03:10 -0700)]
Fix catpkgsplit() to validate the category part. This fixes
vardbapi.cp_all() to reject invalid categories.
Zac Medico [Sat, 25 Sep 2010 08:28:48 +0000 (01:28 -0700)]
Bug #338588 - Allow quickpkg to create packages even though the
current user doesn't have permission to lock /var/db/pkg.
Zac Medico [Sat, 25 Sep 2010 08:17:44 +0000 (01:17 -0700)]
Bug #337465 - Enable EbuildIpcDaemon on Darwin and FreeBSD since
it seems fixed now.
This reverts commit
0906fee12ffe0ebd07e8952316f03927962af29b.
Zac Medico [Fri, 24 Sep 2010 02:39:39 +0000 (19:39 -0700)]
Make EbuildIpcDaemon._input_handler() handle EAGAIN from os.read()
for FreeBSD (bug 337465, comment #35).
Fabian Groffen [Thu, 23 Sep 2010 16:55:51 +0000 (18:55 +0200)]
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
Arfrever Frehtes Taifersar Arahesis [Thu, 23 Sep 2010 16:57:05 +0000 (18:57 +0200)]
Add binpkg-logs to the list of supported features.
Fabian Groffen [Thu, 23 Sep 2010 16:55:22 +0000 (18:55 +0200)]
always use eroot with CONFIG_MEMORY_FILE
Zac Medico [Thu, 23 Sep 2010 07:07:08 +0000 (00:07 -0700)]
Bug #337465 - Make EbuildIpcDaemon._input_handler() use os.read()
since array.fromfile() and file.read() are both known to erroneously
return an empty string from this non-blocking fifo stream on FreeBSD.
Zac Medico [Thu, 23 Sep 2010 04:45:17 +0000 (21:45 -0700)]
Add support for FEATURES=binpkg-logs which is similar to unmerge-logs,
but applies to all binary package merges.
Zac Medico [Wed, 22 Sep 2010 03:07:01 +0000 (20:07 -0700)]
Fix a typo in a comment.
Zac Medico [Wed, 22 Sep 2010 02:56:29 +0000 (19:56 -0700)]
In EbuildIpc._receive_reply(), close the input_file when finished.
Zac Medico [Wed, 22 Sep 2010 02:54:29 +0000 (19:54 -0700)]
In EbuildIpc._wait(), use waitpid() instead of wait() since we really
only need to wait on one process.
Zac Medico [Wed, 22 Sep 2010 02:30:58 +0000 (19:30 -0700)]
Bug #337465 - Make ebuild-ipc use an array in order to force a
single atomic read of a whole pickle.
Zac Medico [Tue, 21 Sep 2010 21:18:25 +0000 (14:18 -0700)]
Bug #337465 - Disable EbuildIpcDaemon on Darwin and FreeBSD since
it reportedly triggers a tight loop in emerge.
This reverts commit
6085103bdd7623d941e3c6ae5905e66658c49fd7.
Zac Medico [Tue, 21 Sep 2010 18:40:25 +0000 (11:40 -0700)]
Make ebuild-ipc use select() for timeouts, instead of alarm signals.
Zac Medico [Tue, 21 Sep 2010 18:26:27 +0000 (11:26 -0700)]
Bug #338267 - Fix broken PORTAGE_BUILDDIR assertion in Binpkg when
PORTAGE_TMPDIR is a symlink.
Zac Medico [Tue, 21 Sep 2010 15:41:54 +0000 (08:41 -0700)]
Bug #338190 - Handle more exceptions inside getbinpkg.dir_get_metadata().
The ftplib.all_errors attribute is a useful collection of exceptions
to handle here. Thanks to Christian Kauhaus <kc@gocept.com> for the
suggestion.
Zac Medico [Tue, 21 Sep 2010 10:02:55 +0000 (03:02 -0700)]
Fix ConfigTestCase.testLicenseManager() breakage from from previous
commit.
Zac Medico [Tue, 21 Sep 2010 09:13:11 +0000 (02:13 -0700)]
Bug #300455 - Store LicenseManager._license_groups values as frozenset
in order to avoid false warnings about circular group references.
Sebastian Luther [Tue, 21 Sep 2010 06:41:39 +0000 (08:41 +0200)]
reposyntax: Add support in _sets/base.py
Zac Medico [Tue, 21 Sep 2010 03:10:12 +0000 (20:10 -0700)]
Fix default() and default_src_install() definitions to account for
the new EAPI 4 default src_install implementation.
Zac Medico [Tue, 21 Sep 2010 02:15:36 +0000 (19:15 -0700)]
Make ebuild-ipc use a normal read() call instead of array.fromfile()
since that should work fine for blocking IO.
Zac Medico [Tue, 21 Sep 2010 02:07:22 +0000 (19:07 -0700)]
Remove obsolete comment about non-blocking from
EbuildIpcDaemon._send_reply() since ebuild-ipc now uses blocking IO.
Zac Medico [Tue, 21 Sep 2010 01:43:10 +0000 (18:43 -0700)]
Make ebuild-ipc kill the child IO process before it exits due to timeout.
Zac Medico [Tue, 21 Sep 2010 01:17:23 +0000 (18:17 -0700)]
Fix ebuild-ipc to correctly handle non-zero return codes from
has_version ipc calls.
Zac Medico [Tue, 21 Sep 2010 01:06:56 +0000 (18:06 -0700)]
Rewrite ebuild-ipc timeout handling to use forks.
Use forks so that the child process can handle blocking IO
un-interrupted, while the parent handles all timeout
considerations. This helps to avoid possible race conditions
from interference between timeouts and blocking IO operations.
Zac Medico [Mon, 20 Sep 2010 23:36:06 +0000 (16:36 -0700)]
Remove obsolete docstring from _RepoDisplay.__str__().
Zac Medico [Mon, 20 Sep 2010 23:34:08 +0000 (16:34 -0700)]
Make ebuild-ipc show an additional 'read failed' message if the buffer
happens to be empty after the read loop.
Zac Medico [Mon, 20 Sep 2010 23:24:38 +0000 (16:24 -0700)]
If ebuild-ipc times out during read, check if the read buffer is
non-empty in order to try to avoid a possible race condition.
Sebastian Luther [Mon, 20 Sep 2010 11:29:42 +0000 (13:29 +0200)]
Tests: add resolver/test_output: Make sure we don't backtrace in the merge list printer
Sebastian Luther [Mon, 20 Sep 2010 10:50:23 +0000 (12:50 +0200)]
Move mergelist printing into resolver/output.py