Zac Medico [Sat, 7 May 2011 17:25:20 +0000 (10:25 -0700)]
PreserveLibsRegistry: add lock/unlock assertions
Also, add comments to store() about unobvious interaction with
locking due to atomic replacement of the inode.
Zac Medico [Sat, 7 May 2011 03:28:21 +0000 (20:28 -0700)]
Remove redundant pruneNonExisting() call.
Since commit
f36b9fa38b5268c2a5579db62acec026625f84a9, the
PreservedLibsRegistry automatically prunes itself each time
that it is loaded.
Zac Medico [Sat, 7 May 2011 03:02:50 +0000 (20:02 -0700)]
preserve-libs: fix linkmap logic for new plibs
Together with commit
f36b9fa38b5268c2a5579db62acec026625f84a9,
hopefully this solves bug #366061.
David James [Thu, 5 May 2011 21:08:27 +0000 (14:08 -0700)]
Cleanup preserved lib locking in portage.
This change makes preserved lib modification atomic, and
prepares us for narrowing the scope of the merge lock.
BUG=chromium-os:14983
TEST=Ran test suite and some example emerges.
Change-Id: I39abb6a5ec72be3274e508ef807ac1d9e69db1a8
Review URL: http://gerrit.chromium.org/gerrit/417
Zac Medico [Thu, 5 May 2011 17:21:43 +0000 (10:21 -0700)]
depgraph: simplify break_refs
Zac Medico [Thu, 5 May 2011 15:58:22 +0000 (08:58 -0700)]
emerge: fix misspell suggestion with category
A name collision in the "cp" variable caused it to malfunction.
Zac Medico [Thu, 5 May 2011 15:15:20 +0000 (08:15 -0700)]
Update timestamps in headers of modified files.
Zac Medico [Thu, 5 May 2011 06:44:48 +0000 (23:44 -0700)]
repoman: make virtual.oldstyle a warning for now
This will give third-party repoman users some time to migrate their
repos away old-style virtuals.
Zac Medico [Wed, 4 May 2011 21:40:11 +0000 (14:40 -0700)]
add_pkg_deps: removal action discard DEPEND early
Zac Medico [Wed, 4 May 2011 18:18:34 +0000 (11:18 -0700)]
add_pkg_deps: use dep priority to ignore blockers
David James [Wed, 4 May 2011 17:35:02 +0000 (10:35 -0700)]
test_rebuild: test --rebuild-if-new-rev more
Zac Medico [Wed, 4 May 2011 17:20:58 +0000 (10:20 -0700)]
add_pkg_dep_string: respect traverse_ignored_deps
I don't think this makes any difference now, but it clarifies how
traverse_ignored_deps should behave.
David James [Wed, 4 May 2011 06:32:05 +0000 (23:32 -0700)]
emerge: replace --rebuild with finer grained opts
Replace --rebuild option with --rebuild-if-* options.
--rebuild-if-new-rev [ y | n ]
Rebuild packages when dependencies that are used at both build-time and
run-time are built, if the dependency is not already installed with the
same version and revision.
--rebuild-if-new-ver [ y | n ]
Rebuild packages when dependencies that are used at both build-time and
run-time are built, if the dependency is not already installed with the
same version. Revision numbers are ignored.
--rebuild-if-unbuilt [ y | n ]
Rebuild packages when dependencies that are used at both build-time and
run-time are built.
Change-Id: Ia50c1702bfe1b98a8d1891740e7bbb045921a905
Review URL: http://gerrit.chromium.org/gerrit/280
Zac Medico [Wed, 4 May 2011 16:36:29 +0000 (09:36 -0700)]
doins: add reference to bug #239529
The reasoning for the code from commit
55b3150af635a418ba3f1424132359c894db7ec4 is not really obvious, so
it's helpful to reference the corresponding bug report.
Mike Gilbert [Wed, 4 May 2011 03:28:21 +0000 (23:28 -0400)]
Fix Manifest.updateAllHashes()
David James [Tue, 3 May 2011 20:51:30 +0000 (13:51 -0700)]
Add --rebuild-ignore flag.
A space separated list of package names or slot atoms. Emerge will not rebuild
packages that depend on matching packages due to \fB\-\-rebuild\fR.
Change-Id: Ia58fe632ed06c97a22413da0341d7f8da2d65ba8
Review URL: http://gerrit.chromium.org/gerrit/209
David James [Tue, 3 May 2011 20:10:28 +0000 (13:10 -0700)]
rebuild_config: propagate runtime deps to parents
Update rebuild option to propagate runtime deps to parents.
Suggested by SebastianLuther@gmx.de
BUG=chromium-os:14858
TEST=Added unit test. Ran unit tests.
Change-Id: I7228a8558eddd1956c590de39430172476c66228
Review URL: http://gerrit.chromium.org/gerrit/202
Zac Medico [Tue, 3 May 2011 03:00:54 +0000 (20:00 -0700)]
cpv_expand: avoid old-style virtual code
This allows portageq calls to avoid loading vdb_metadata.pickle in
most cases, which greatly improves performance.
Arfrever Frehtes Taifersar Arahesis [Mon, 2 May 2011 20:17:15 +0000 (22:17 +0200)]
Avoid evaluation of values of variables in set_unless_changed().
Zac Medico [Mon, 2 May 2011 19:54:54 +0000 (12:54 -0700)]
emerge: skip misspell suggestion if cp exists
Zac Medico [Mon, 2 May 2011 19:34:21 +0000 (12:34 -0700)]
depgraph: autounmask account for optional deps
Zac Medico [Mon, 2 May 2011 19:12:13 +0000 (12:12 -0700)]
emerge: rename --no*-atoms to --*-exclude
Zac Medico [Mon, 2 May 2011 17:56:51 +0000 (10:56 -0700)]
ebuild.sh: make INHERITED independent of phase
When EBUILD_PHASE != depend, INHERITED comes pre-initialized
from cache. In order to make INHERITED content independent of
EBUILD_PHASE during inherit() calls, we unset INHERITED after
we make a backup copy for QA checks.
Zac Medico [Mon, 2 May 2011 03:42:24 +0000 (20:42 -0700)]
Update timestamps in headers of modified files.
Zac Medico [Mon, 2 May 2011 03:09:33 +0000 (20:09 -0700)]
depgraph: queue ignored deps for later traversal
This will fix an issue with some build-time deps being ignored by
--complete-graph in cases when --with-bdeps is not enabled. It
should help --rebuild to find more rebuilds in this case.
Zac Medico [Mon, 2 May 2011 01:42:32 +0000 (18:42 -0700)]
depgraph: account for new-style virtual/libc
This will fix bug #364681.
Zac Medico [Sun, 1 May 2011 23:27:48 +0000 (16:27 -0700)]
trigger_rebuilds: handle circular deps
Zac Medico [Sun, 1 May 2011 21:17:06 +0000 (14:17 -0700)]
depgraph: traverse bdeps in complete mode
This makes the graph as complete as possible, and can help --rebuild to
find more rebuilds.
Zac Medico [Sun, 1 May 2011 20:23:13 +0000 (13:23 -0700)]
depgraph: ignore unwanted virtuals
This fixes an unwanted side-effect from commit
470871eeafa89a05486d4eb6f3f7626c1f813e4d.
David James [Sun, 1 May 2011 17:21:45 +0000 (10:21 -0700)]
emerge: add --rebuild and --norebuild-atoms opts
Rebuild when build-time/run-time deps are upgraded.
If pkgA has been updated, and pkgB depends on pkgA at both
build-time and run-time, pkgB needs to be rebuilt. This
feature ensures that all packages are consistent when
dependencies that are used at both runtime and build time
are changed.
This feature only rebuilds packages one layer deep. That
means that if you upgrade libcros, for example, packages
that depend directly on libcros will be rebuilt and
reinstalled, but indirect dependencies will not be rebuilt.
BUG=chromium-os:14296
TEST=Test whether packages rebuilding a bunch of packages.
Change-Id: Idbc0532b4b1de28fd9e5a0abe3b7dbe1a3abd2c8
Review URL: http://codereview.chromium.org/
6905107
Zac Medico [Sun, 1 May 2011 16:30:36 +0000 (09:30 -0700)]
repoman: remove most old-style virtual checks
PROVIDE virtuals have been banned from Gentoo's tree (see bug #365505),
so these checks aren't needed anymore. The PROVIDE.syntax check is kept
in the Package class since PROVIDE is still supported for backward
compatibility, and therefore invalid syntax can still have negative
effects. This check can be removed if/when backward compatibilty is
completely dropped.
Ulrich Mueller [Sun, 1 May 2011 15:57:33 +0000 (08:57 -0700)]
repoman: Check for PROVIDE.
This will fix bug #365505.
Arfrever Frehtes Taifersar Arahesis [Sun, 1 May 2011 14:50:30 +0000 (16:50 +0200)]
Support multiple arguments in set_unless_changed() and unset_unless_changed().
Use VARIABLE=VALUE syntax for arguments of set_unless_changed().
Zac Medico [Sun, 1 May 2011 14:18:42 +0000 (07:18 -0700)]
runtests.sh: propagate arguments to runTests
Arfrever Frehtes Taifersar Arahesis [Sun, 1 May 2011 01:21:57 +0000 (03:21 +0200)]
Bug #365439: Add set_unless_changed() and unset_unless_changed().
Zac Medico [Sat, 30 Apr 2011 20:38:00 +0000 (13:38 -0700)]
depgraph: migrate implicit libc deps from Sched
Now all the virtual/libc handling is done by the depgraph, which
will be helpful when fixing bug #364681.
Arfrever Frehtes Taifersar Arahesis [Sat, 30 Apr 2011 16:30:29 +0000 (18:30 +0200)]
install_qa_check(): Simplify code and make 'l' a local variable.
David James [Sat, 30 Apr 2011 00:21:58 +0000 (17:21 -0700)]
Check for references to ${ROOT} in install_qa_checks.
When ROOT != /, binaries that reference ROOT will load their
dependencies from ROOT first rather than from the system-configured
path. This is a problem because the ROOT will be / on the target
system.
Besides the above, this patch also fixes incorrect parsing of scanelf
output, where we would treat the RPATHs returned by scanelf as the
names of binaries.
TEST=When "stricter" FEATURE is enabled, verify that emerge
fails when an ebuild references broken rpaths referencing
ROOT. When "stricter" FEATURE is not enabled, verify that such
references are automatically fixed. Also verify that ebuilds
with non-broken RPATHs (e.g. RPATHs referencing $ORIGIN/../lib)
are not touched by the change.
BUG=chromium-os:14271
Change-Id: I4f29cc4ea9195a1255f080284da1f676e4a2c26b
Review URL: http://codereview.chromium.org/
6903153
Zac Medico [Fri, 29 Apr 2011 16:07:25 +0000 (09:07 -0700)]
emergelog: only set permission on creation
This will fix bug #365319.
Zac Medico [Fri, 29 Apr 2011 15:04:13 +0000 (08:04 -0700)]
action_info: eliminate duplicate info_pkgs match
Currently, sys-kernel/linux-headers is matched by both a plain
sys-kernel/linux-headers atom and by the virtual/os-headers new-style
virtual. For backward compatibility, we're going to have duplicates
like this for at least a few months (see bug #364673, comment #5).
Therefore, automatically eliminate duplicates in the display. Entries
that include virtual provider info are preferred over those that do
not.
Zac Medico [Thu, 28 Apr 2011 21:31:03 +0000 (14:31 -0700)]
_postinst_bsdflags: apply to $ROOT, not $D
David James [Thu, 28 Apr 2011 21:22:15 +0000 (14:22 -0700)]
Move preinst/postinst_bsdflags from bash to py
Moving these commands from shell to Python helps avoid an unnecessary
call to misc-functions.sh for the postinst_bsdflags. This improves
performance.
BUG=none
TEST=Run emerge-x86-generic -eg --jobs=16 libchrome
Change-Id: I0c2af50b4d2f7644cabac84fde7fe4d682010c69
Review URL: http://codereview.chromium.org/
6676107
Zac Medico [Thu, 28 Apr 2011 21:07:08 +0000 (14:07 -0700)]
display_preserved_libs: load plib_registry
Since commit
7535cabdf2fab76fc55df83643157613dfd66be9, the
plib_registry is modified in a subprocess, and the parent
process' copy can become stale because of this. Therefore,
explicitly load it.
Zac Medico [Thu, 28 Apr 2011 16:10:02 +0000 (09:10 -0700)]
emerge: add --misspell-suggestions=n option
This will fix bug #363137.
Zac Medico [Thu, 28 Apr 2011 12:58:35 +0000 (05:58 -0700)]
emerge: fix indent for --binpkg-respect-use help
Zac Medico [Wed, 27 Apr 2011 22:58:16 +0000 (15:58 -0700)]
emerge: add --help for 3 new options
David James [Wed, 27 Apr 2011 22:07:12 +0000 (15:07 -0700)]
emerge: add 3 new options similar to --exclude
Add --nousepkg-atoms, --useoldpkg-atoms, and --reinstall-atoms flag
to Portage
reinstall-atoms accepts a space separated list of package names or
slot atoms. Emerge will treat matching packages as if they are not
installed, and reinstall them if necessary.
useoldpkg-atoms accepts a space separated list of package names or
slot atoms. Emerge will prefer matching binary packages over newer
unbuilt packages. This is useful in case you want to request that a
particular package won't be rebuilt from source.
nousepkg-atoms accepts a space separated list of package names or
slot atoms. Emerge will ignore matching binary packages.
Change-Id: I0d73039c6a4cd63695b28ffc80215628e0e05c95
BUG=chromium-os:12507 TEST=Try out the flag
Review URL: http://codereview.chromium.org/
6577024
Sebastian Luther [Wed, 27 Apr 2011 20:36:15 +0000 (13:36 -0700)]
--autounmask: Don't change masked/forced flags
This will fix bug #364701.
Zac Medico [Wed, 27 Apr 2011 16:13:51 +0000 (09:13 -0700)]
expand_new_virt: don't traverse blockers
Zac Medico [Wed, 27 Apr 2011 14:35:57 +0000 (07:35 -0700)]
expand_new_virt: validate EAPI, IUSE and USE
Zac Medico [Wed, 27 Apr 2011 14:05:24 +0000 (07:05 -0700)]
expand_new_virt: eliminate cpv_getkey
Zac Medico [Tue, 26 Apr 2011 23:57:20 +0000 (16:57 -0700)]
expand_new_virt: use stack for recursion
Ryan Hill [Tue, 26 Apr 2011 21:16:20 +0000 (14:16 -0700)]
Bug #364467 - handle gcc-4.6-style QA warnings
Arfrever Frehtes Taifersar Arahesis [Tue, 26 Apr 2011 20:50:03 +0000 (22:50 +0200)]
Fix a typo.
Zac Medico [Tue, 26 Apr 2011 20:19:34 +0000 (13:19 -0700)]
emerge --info: support new-style virtuals
This will fix bug #364673.
Zac Medico [Sat, 23 Apr 2011 15:41:07 +0000 (08:41 -0700)]
ebuild(1): fix env FEATURES overrides bug #364035
Tomas Chvatal [Wed, 20 Apr 2011 23:56:06 +0000 (16:56 -0700)]
repoman: deprecate more eclasses
Zac Medico [Thu, 14 Apr 2011 01:54:30 +0000 (18:54 -0700)]
repoman: cleanup gpgsign
Zac Medico [Wed, 13 Apr 2011 07:59:38 +0000 (00:59 -0700)]
Update timestamps in headers of modified files.
Zac Medico [Tue, 12 Apr 2011 01:09:20 +0000 (18:09 -0700)]
doins: tweak $DISTDIR symlink handling
Only match stuff inside $PORTAGE_ACTUAL_DISTDIR/ so that we don't
stray from PMS.
Zac Medico [Mon, 11 Apr 2011 23:23:54 +0000 (16:23 -0700)]
doins: dereference abs symlinks to files
Our fake $DISTDIR contains symlinks that should not be reproduced
inside $D. In order to ensure that things like dodoc
"$DISTDIR"/foo.pdf work as expected, we dereference symlinked files
that are referenced by absolute paths. Thanks to James Cloos
<cloos@jhcloos.com> for reporting this issue which he observed with
the sci-mathematics/minisat ebuild.
Zac Medico [Mon, 11 Apr 2011 23:00:02 +0000 (16:00 -0700)]
extract_affecting_use: test bug #363073
Zac Medico [Mon, 11 Apr 2011 22:30:13 +0000 (15:30 -0700)]
extract_affecting_use: allow parens in atoms
This fixes bug #363073 in which an InvalidDependString exception is
erroneously triggered by atoms containing EAPI 4 USE dependency
defaults. This case is very similar to bug #354003 which was fixed in
commit
8735222b77e66850213e2aa6a7ea48e744ba0d4f.
David James [Mon, 11 Apr 2011 19:00:39 +0000 (12:00 -0700)]
Remove unnecessary sync in Scheduler.py.
If we are passed a fakevartree object, it should already be sync'd, so
there is no need to sync it again here. This sync is only needed when
we create a new FakeVartree, so I moved the sync to the right place to
fix this.
BUG=chromium-os:14035
TEST=Build a bunch of packages with this patch.
Change-Id: I89d79cf946f4c0c27ad585ad7c88a41985260342
Review URL: http://codereview.chromium.org/
6813084
Zac Medico [Sun, 10 Apr 2011 20:05:45 +0000 (13:05 -0700)]
Fix a typo in a comment.
Zac Medico [Sun, 10 Apr 2011 20:03:11 +0000 (13:03 -0700)]
Scheduler: add more info in docstring comments
This clarifies the purposes of _system_merge_started and _choose_pkg.
David James [Thu, 7 Apr 2011 23:49:58 +0000 (16:49 -0700)]
Add force-mirror FEATURE.
force-mirror: Only fetch files from configured mirrors, ignoring
SRC_URI, except when mirror is in the ebuild(5) RESTRICT variable.
BUG=chromium-os:13221
TEST=Test that ebuilds now fail with FEATURES=force-mirror if files are
not in the configured mirror.
Change-Id: I8484d5af8dff97b431398030b33c024ff1295ba0
Review URL: http://codereview.chromium.org/
6677171
Zac Medico [Mon, 4 Apr 2011 22:03:01 +0000 (15:03 -0700)]
filter PORTAGE_GPG_SIGNING_COMMAND for ebuild env
Arfrever Frehtes Taifersar Arahesis [Sun, 3 Apr 2011 17:30:33 +0000 (19:30 +0200)]
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
Arfrever Frehtes Taifersar Arahesis [Sun, 3 Apr 2011 17:28:58 +0000 (19:28 +0200)]
Support PORTAGE_GPG_SIGNING_COMMAND variable.
Zac Medico [Sun, 3 Apr 2011 15:54:10 +0000 (08:54 -0700)]
repoman: fix profiles.desc overlay path
Thanks to Alexey Shvetsov <alexxy@gentoo.org> for reporting this issue
and testing the fix.
Zac Medico [Thu, 31 Mar 2011 15:41:52 +0000 (08:41 -0700)]
Display: fix fetch restrict msg for RO_DISTDIRS
This will fix bug #361463.
Arfrever Frehtes Taifersar Arahesis [Wed, 30 Mar 2011 22:19:54 +0000 (00:19 +0200)]
Minor improvements in gpgsign().
repoman_settings["PORTAGE_GPG_DIR"] is always set.
Arfrever Frehtes Taifersar Arahesis [Wed, 30 Mar 2011 20:32:45 +0000 (22:32 +0200)]
Simplify calculation of repoman_settings["PORTAGE_GPG_DIR"] in gpgsign().
os.path.expanduser() works even when HOME environment variable is not set.
Zac Medico [Wed, 30 Mar 2011 18:36:35 +0000 (11:36 -0700)]
chk_updated_info_files: handle --quiet
This will fix bug #361257.
Arfrever Frehtes Taifersar Arahesis [Wed, 30 Mar 2011 15:03:22 +0000 (17:03 +0200)]
Use os.path.expanduser() to simplify code.
Zac Medico [Sun, 27 Mar 2011 22:37:47 +0000 (15:37 -0700)]
display_merge: tweak background/logging logic
Zac Medico [Sun, 27 Mar 2011 21:26:08 +0000 (14:26 -0700)]
dblink: rename 'buffer' var in _elog_process
Avoid name collision with built-in 'buffer' function.
Zac Medico [Sun, 27 Mar 2011 20:57:35 +0000 (13:57 -0700)]
unmerge: fix lock/UnsupportedAPIException logic
Zac Medico [Sun, 27 Mar 2011 20:55:11 +0000 (13:55 -0700)]
UnsupportedAPIException: handle unicode in EAPI
Normally EAPI doesn't contain unicode, but as in bug #359675, it can
contain practically anything if files in /var/db/pkg are corrupt.
Zac Medico [Sun, 27 Mar 2011 20:01:10 +0000 (13:01 -0700)]
emerge-webrsync: drop lzma support
The lzma snapshots have been replaced by xz snapshots, as discussed in
the "RFC: Remove .lzma in favor of .xz portage snapshots" thread on the
gentoo-dev ml:
http://archives.gentoo.org/gentoo-dev/msg_7de1b57ce531fdf33d33b5b070006436.xml
Zac Medico [Sun, 27 Mar 2011 06:09:27 +0000 (23:09 -0700)]
MergeProcess: add fallback setcpv call
It's important that this metadata access happens in the parent process,
since closing of file descriptors in the subprocess can prevent access
to open database connections such as that used by the sqlite metadata
cache module.
Zac Medico [Sat, 26 Mar 2011 23:25:15 +0000 (16:25 -0700)]
MergeProcess: query blockers in the main process
Metadata cache queries may not work for some databases from within a
subprocess. For example, sqlite is known to misbehave.
Zac Medico [Sat, 26 Mar 2011 18:00:44 +0000 (11:00 -0700)]
display_merge: pass through noiselevel args
Zac Medico [Sat, 26 Mar 2011 17:10:24 +0000 (10:10 -0700)]
Scheduler: pkg_to_replace beware old-style virt
Zac Medico [Sat, 26 Mar 2011 16:12:38 +0000 (09:12 -0700)]
BlockerDB: add SLOT match in discardBlocker
Zac Medico [Sat, 26 Mar 2011 08:52:49 +0000 (01:52 -0700)]
MergeListItem: inherit _poll and _wait
Zac Medico [Sat, 26 Mar 2011 08:18:12 +0000 (01:18 -0700)]
MergeProcess: relocate portage reinstall code
This code goes inside _start since it needs to execute in the parent
process.
Zac Medico [Sat, 26 Mar 2011 07:38:23 +0000 (00:38 -0700)]
unmerge: fix PORTAGE_BACKGROUND logic
Zac Medico [Sat, 26 Mar 2011 07:06:01 +0000 (00:06 -0700)]
Reoranize PackageMerge/MergeListItem interaction.
Zac Medico [Sat, 26 Mar 2011 03:38:11 +0000 (20:38 -0700)]
PackageMerge: call wait() for conformity
Zac Medico [Sat, 26 Mar 2011 03:36:47 +0000 (20:36 -0700)]
Update header timestamps for modified files.
Zac Medico [Sat, 26 Mar 2011 03:24:10 +0000 (20:24 -0700)]
MergeProcess: call elog_process for replaced pkgs
Zac Medico [Sat, 26 Mar 2011 02:43:12 +0000 (19:43 -0700)]
dblink: use self.mycpv in _elog
Zac Medico [Sat, 26 Mar 2011 02:00:16 +0000 (19:00 -0700)]
MergeProcess: toggle vardbapi._pkgs_changed
Zac Medico [Sat, 26 Mar 2011 01:44:46 +0000 (18:44 -0700)]
config: blacklist PORTAGE_BACKGROUND* vars
Zac Medico [Fri, 25 Mar 2011 20:52:16 +0000 (13:52 -0700)]
MergeProcess: handle unicode in elog pipe
David James [Fri, 25 Mar 2011 17:10:54 +0000 (10:10 -0700)]
env_update: remove sleep_for_mtime_granularity
Instead of sleeping, use os.utime to avoid mtime ambiguity.
Change-Id: I359ececca19b6be9f5997ac5c8fe6fea6ea49dd5
Review URL: http://codereview.chromium.org/
6676150
Zac Medico [Fri, 25 Mar 2011 16:52:40 +0000 (09:52 -0700)]
PollScheduler: tweak _unregister event cleanup
Zac Medico [Fri, 25 Mar 2011 15:57:10 +0000 (08:57 -0700)]
PollScheduler: handle missing log directory
This can be triggered by AbstractPollTask._log_poll_exception(), as
reported by Michael Haubenwallner <haubi@gentoo.org> for AIX.