portage.git
13 years agomerge: handle symlink replacing dir
Zac Medico [Sat, 23 Jul 2011 18:46:41 +0000 (11:46 -0700)]
merge: handle symlink replacing dir

Previously, these symlinks would trigger a file collision message and
would then be silently dropped in cases when the file collsion did not
cause emerge to bail out due to FEATURES=protect-owned or
collision-protect.

Now, if emerge doesn't bail out due to a file collision, it will
trigger an eerror message and merge the symlink with a .backup.XXXX
extension appended to the file name, similar to handling of regular
files in commit 740f71301ed3daf44c0e77df5d5de39fe1438fb1. This will
fix bug 326685.

13 years agoLinkageMapELF: remove 5-tuple unpack code
Zac Medico [Sat, 23 Jul 2011 06:22:52 +0000 (23:22 -0700)]
LinkageMapELF: remove 5-tuple unpack code

13 years agoLinkageMapELF: add getOwners() method and use it
Zac Medico [Fri, 22 Jul 2011 22:59:13 +0000 (15:59 -0700)]
LinkageMapELF: add getOwners() method and use it

This preserves the owner information inside LinkageMap.rebuild() and
uses it to implement a getOwners() method, which makes it possible to
efficiently lookup owners of library providers and consumers.

13 years agoLinkageMapELF: use a class for _obj_properies
Zac Medico [Fri, 22 Jul 2011 20:38:04 +0000 (13:38 -0700)]
LinkageMapELF: use a class for _obj_properies

This simplifies the interface, avoiding the need for hardcoded indexes
and making it easy to add new attributes.

13 years agoLinkageMapELF: optimize memory usage
Zac Medico [Fri, 22 Jul 2011 07:58:56 +0000 (00:58 -0700)]
LinkageMapELF: optimize memory usage

This reduces memory consumption by approximately 30%, by replacing
mutable set instances with arrays, tuples, and frozensets where
appropriate. Also, identical frozenset instances are shared when
available.

13 years agoBinpkgFetcher: support selinux PORTAGE_FETCH_T
Zac Medico [Thu, 21 Jul 2011 16:56:33 +0000 (09:56 -0700)]
BinpkgFetcher: support selinux PORTAGE_FETCH_T

Thanks to Sven Vermeulen <sven.vermeulen@siphos.be> for the initial
patch posted on bug #375835.

13 years agoEverythingSet: always create SLOT atoms
Zac Medico [Thu, 21 Jul 2011 16:14:50 +0000 (09:14 -0700)]
EverythingSet: always create SLOT atoms

Before it would only include the SLOT in the atom if there were
multiple slots installed. However, taht could lead to unwanted upgrades
as reported in bug #338959. Therefore, always create SLOT atoms.

13 years agoOptimize LinkageMapELF.findConsumers().
Zac Medico [Wed, 20 Jul 2011 08:04:00 +0000 (01:04 -0700)]
Optimize LinkageMapELF.findConsumers().

If there are no non-excluded providers then there's no need to search
for satisfied consumers.

13 years agoFix unused case in LinkageMapELF.findConsumers().
Zac Medico [Wed, 20 Jul 2011 04:44:14 +0000 (21:44 -0700)]
Fix unused case in LinkageMapELF.findConsumers().

Currently, we never pass in more that one package via the
exclude_providers argument, so we never trigger the flaw in the logic
that this fixes.

13 years agoScheduler: fix _running_tasks for uninstalls v2.2.0_alpha46
Zac Medico [Tue, 19 Jul 2011 20:23:35 +0000 (13:23 -0700)]
Scheduler: fix _running_tasks for uninstalls

13 years agoEbuildBuild: pass ebuild_path to EbuildFetcher
Zac Medico [Tue, 19 Jul 2011 19:52:29 +0000 (12:52 -0700)]
EbuildBuild: pass ebuild_path to EbuildFetcher

This avoids a redundant pordbapi.findname() call.

13 years agoMake emerge --noreplace identical to --selective.
Zac Medico [Tue, 19 Jul 2011 08:36:58 +0000 (01:36 -0700)]
Make emerge --noreplace identical to --selective.

This removes a very subtle difference in --noreplace package selection
logic which is not very useful and triggers strange package selection
choices in some cases, as reported in bug #375571.

13 years agoScheduler: simplify _terminate_tasks
Zac Medico [Mon, 18 Jul 2011 08:21:39 +0000 (01:21 -0700)]
Scheduler: simplify _terminate_tasks

This should also fix bugs related to CompositeTask instances waiting
for queued tasks to start and not being properly terminated in this
case.

13 years agopreserve-libs: search for alt providers of soname
Zac Medico [Mon, 18 Jul 2011 05:30:54 +0000 (22:30 -0700)]
preserve-libs: search for alt providers of soname

This will fix bug #289180 by making LinkageMapELF.findconsumers()
exclude consumers from the results in cases when they are satisfied by
an alternative provider of the required soname.

13 years agoScheduler: allow concurrent fetch with --jobs > 1
Zac Medico [Sun, 17 Jul 2011 18:16:20 +0000 (11:16 -0700)]
Scheduler: allow concurrent fetch with --jobs > 1

This reverts behavior from bug #375331 (commit
f07f8386e945b48358c11c121960e4833c539752) for cases in which --jobs is
greater than 1. We can add a separate --fetch-jobs option later, but
for now, this preserves previous behavior for --jobs > 1.

13 years agoFix a typo in a doc string.
Arfrever Frehtes Taifersar Arahesis [Sun, 17 Jul 2011 04:35:26 +0000 (06:35 +0200)]
Fix a typo in a doc string.

13 years agoEbuildFetcher: handle FileNotFound
Zac Medico [Sun, 17 Jul 2011 00:32:10 +0000 (17:32 -0700)]
EbuildFetcher: handle FileNotFound

13 years agoFix a typo in a comment.
Zac Medico [Sun, 17 Jul 2011 00:10:36 +0000 (17:10 -0700)]
Fix a typo in a comment.

13 years agoBinpkg: use fetch queue to cap fetch threads
Zac Medico [Sun, 17 Jul 2011 00:04:08 +0000 (17:04 -0700)]
Binpkg: use fetch queue to cap fetch threads

This is analogous to commit f07f8386e945b48358c11c121960e4833c539752
for bug #375331, but for fetching from binhosts.

13 years agoEbuildBuild: skip the fetch queue when possible
Zac Medico [Sat, 16 Jul 2011 23:30:14 +0000 (16:30 -0700)]
EbuildBuild: skip the fetch queue when possible

Since commit f07f8386e945b48358c11c121960e4833c539752, it was possible
for EbuildBuild to wait on the fetch queue even in cases in which all
required files had been previously fetched. Now this case is optimized
to skip the fetch queue, as discribed in bug #375331, comment #2.

13 years agoScheduler: enable prefetch for first package
Zac Medico [Sat, 16 Jul 2011 07:30:05 +0000 (00:30 -0700)]
Scheduler: enable prefetch for first package

Since commit f07f8386e945b48358c11c121960e4833c539752, the first will
have to wait for later ones to fetch unless we start its prefetcher
first.

13 years agoEbuildBuild: use fetch queue to cap fetch threads
Zac Medico [Sat, 16 Jul 2011 06:16:20 +0000 (23:16 -0700)]
EbuildBuild: use fetch queue to cap fetch threads

This will fix bug #375331.

13 years agoSkip QA Notice for hasq/useq during *rm phases.
Zac Medico [Fri, 15 Jul 2011 17:06:47 +0000 (10:06 -0700)]
Skip QA Notice for hasq/useq during *rm phases.

13 years agoportageq: reference GLEP 37 in expand_virtual doc
Zac Medico [Thu, 14 Jul 2011 22:32:54 +0000 (15:32 -0700)]
portageq: reference GLEP 37 in expand_virtual doc

13 years agoSet PORTAGE_REPO_NAME for depend phase.
Zac Medico [Thu, 14 Jul 2011 21:53:48 +0000 (14:53 -0700)]
Set PORTAGE_REPO_NAME for depend phase.

13 years agodebuild: pass manifest to digestcheck() v2.2.0_alpha45
Zac Medico [Thu, 14 Jul 2011 01:31:28 +0000 (18:31 -0700)]
debuild: pass manifest to digestcheck()

This allows us to avoid parsing the Manifest twice.

13 years agodoebuild: discard cached manifest when necessary
Zac Medico [Thu, 14 Jul 2011 01:24:49 +0000 (18:24 -0700)]
doebuild: discard cached manifest when necessary

When we call digestgen(), it can regenerate our distfiles digests and
we don't wan to cache stale values in this case.

13 years agodebuild: pass dist digests to fetch()
Zac Medico [Thu, 14 Jul 2011 00:56:57 +0000 (17:56 -0700)]
debuild: pass dist digests to fetch()

This allows us to avoid parsing the Manifest twice.

13 years agoRevert "ebuild(1): allow-missing-manifests for fetch"
Zac Medico [Thu, 14 Jul 2011 00:36:24 +0000 (17:36 -0700)]
Revert "ebuild(1): allow-missing-manifests for fetch"

This reverts commit 62712db56bb863b4eb0a9d9c52e7b2c3ad38df66.

This code already defaulted to the allow-missing-manifests behavior,
since the fetch() allow_missing_digests argument default is true. By
making the argument conditional on allow-missing-manifests, it changed
the behavior in the default case where allow-missing-manifests is
disabled.

13 years agoProtect EBUILD_{FORCE_TEST,SKIP_MANIFEST} vars.
Zac Medico [Wed, 13 Jul 2011 17:25:47 +0000 (10:25 -0700)]
Protect EBUILD_{FORCE_TEST,SKIP_MANIFEST} vars.

These belong in the blacklist, in order to avoid potential interference
from the calling environment.

13 years agofetch: fix ebuild --skip-manifest behavior
Zac Medico [Wed, 13 Jul 2011 17:05:55 +0000 (10:05 -0700)]
fetch: fix ebuild --skip-manifest behavior

This should fix "Insufficient data for checksum verification" errors
triggered by ebuild --skip-manifest.

13 years agoBUILD_TIME: use string format op for time.time() v2.2.0_alpha44
Zac Medico [Tue, 12 Jul 2011 23:38:54 +0000 (16:38 -0700)]
BUILD_TIME: use string format op for time.time()

13 years agoUse portage.subprocess_getstatusoutput() more.
Zac Medico [Tue, 12 Jul 2011 23:20:45 +0000 (16:20 -0700)]
Use portage.subprocess_getstatusoutput() more.

13 years agoAvoid baseline subprocess import under python2.
Zac Medico [Tue, 12 Jul 2011 22:46:54 +0000 (15:46 -0700)]
Avoid baseline subprocess import under python2.

13 years agoemergelog: use string format op for time.time()
Zac Medico [Tue, 12 Jul 2011 22:04:16 +0000 (15:04 -0700)]
emergelog: use string format op for time.time()

13 years agoemergelog: remove unneeded seek for append mode
Zac Medico [Tue, 12 Jul 2011 21:50:21 +0000 (14:50 -0700)]
emergelog: remove unneeded seek for append mode

13 years agoUpdate timestamps in headers of modified files.
Zac Medico [Tue, 12 Jul 2011 21:04:00 +0000 (14:04 -0700)]
Update timestamps in headers of modified files.

13 years agofilter-bash-environment.py: move imports to top
Zac Medico [Tue, 12 Jul 2011 20:16:56 +0000 (13:16 -0700)]
filter-bash-environment.py: move imports to top

13 years agoUse explicit 'mode' keyword arg with io.open().
Zac Medico [Tue, 12 Jul 2011 20:04:15 +0000 (13:04 -0700)]
Use explicit 'mode' keyword arg with io.open().

13 years agoUse explicit 'mode' keyword arg with io.open().
Zac Medico [Tue, 12 Jul 2011 19:48:45 +0000 (12:48 -0700)]
Use explicit 'mode' keyword arg with io.open().

13 years agoresume_depgraph: be careful with parent_node type
Zac Medico [Tue, 12 Jul 2011 19:26:47 +0000 (12:26 -0700)]
resume_depgraph: be careful with parent_node type

13 years agounmerge: reject USE conditionals in arguments
Zac Medico [Tue, 12 Jul 2011 19:15:44 +0000 (12:15 -0700)]
unmerge: reject USE conditionals in arguments

13 years agomisc-functions.sh: fix incorrect has -o usage
Zac Medico [Tue, 12 Jul 2011 18:45:41 +0000 (11:45 -0700)]
misc-functions.sh: fix incorrect has -o usage

13 years agoRemove unneeded _unicode_decode for io.StringIO.
Zac Medico [Tue, 12 Jul 2011 17:32:09 +0000 (10:32 -0700)]
Remove unneeded _unicode_decode for io.StringIO.

Since StringIO.StringIO fallback was removed in commit
5df96179611ce0e98727945b1800b43daccedfc2, we can rely on
io.StringIO.getoutput() to return unicode, so there's no
need to call _unicode_decode on the result.

13 years agoRemove python-2.6 StringIO.StringIO fallback.
Zac Medico [Tue, 12 Jul 2011 08:41:09 +0000 (01:41 -0700)]
Remove python-2.6 StringIO.StringIO fallback.

Since the io module in python-2.6 was broken when threading was
disabled, we needed to fall back from io.StringIO to StringIO.StringIO
in this case (typically just for Gentoo's stage1 and stage2 tarballs).
Now that python-2.7 is stable in stages and we rely on io.open() being
available, we can also rely on io.StringIO being available.

13 years agoautounmask-write: create /etc/portage if needed
Zac Medico [Mon, 11 Jul 2011 21:58:09 +0000 (14:58 -0700)]
autounmask-write: create /etc/portage if needed

13 years agoelog/mod_save: fix permissions for logrotate
Zac Medico [Mon, 11 Jul 2011 21:02:40 +0000 (14:02 -0700)]
elog/mod_save: fix permissions for logrotate

These permissions should be compatible with our default logrotate
config as discussed in bug 374287.

13 years agoelog/mod_save: ensure parent logdir exists
Zac Medico [Mon, 11 Jul 2011 18:00:33 +0000 (11:00 -0700)]
elog/mod_save: ensure parent logdir exists

13 years agoresume_depgraph: fix breakage from reposyntax
Zac Medico [Mon, 11 Jul 2011 17:17:08 +0000 (10:17 -0700)]
resume_depgraph: fix breakage from reposyntax

This is a major regression that has been triggering lots of complaints
about emerge --keep-going.

13 years agoelog/mod_save: use _ensure_log_subdirs
Zac Medico [Mon, 11 Jul 2011 16:55:16 +0000 (09:55 -0700)]
elog/mod_save: use _ensure_log_subdirs

This fixes permission issues with category subdirectories created for
FEATURES=split-elog.

13 years agoprepare_build_dirs: copy logdir group permissions
Zac Medico [Mon, 11 Jul 2011 16:22:37 +0000 (09:22 -0700)]
prepare_build_dirs: copy logdir group permissions

The gid of PORT_LOGDIR is copied to all subdirectories, along with
0x2070 mode bits if present.

13 years agoLog maintainer info for pretend and nofetch.
Zac Medico [Mon, 11 Jul 2011 15:35:38 +0000 (08:35 -0700)]
Log maintainer info for pretend and nofetch.

Also, suppress this maintainer info from going to stdout since it's
intended for the log and it doesn't necessarily need to be visible
elsewhere. This will fix bug #374809.

13 years agoprepare_build_dirs: warn for logdir permission
Zac Medico [Mon, 11 Jul 2011 15:22:11 +0000 (08:22 -0700)]
prepare_build_dirs: warn for logdir permission

If there is insufficient permission to use PORT_LOGDIR or the required
subdirectory, warn instead of raising an exception. Also, fall back to
using $T/build.log as a last resort.

13 years agoebuild.sh: restore old has() implementation
Brian Harring [Mon, 11 Jul 2011 08:33:21 +0000 (01:33 -0700)]
ebuild.sh: restore old has() implementation

The needle/haystack implementation handles whitespace as originally
intended (prior to commit 659eafddd5964820ce8bdc0d90f5fcf7df04b5b7),
as discussed in bug #374791.

Signed-off-by: Brian Harring <ferringb@gmail.com>
13 years agois_valid_package_atom: fix circular import
Zac Medico [Mon, 11 Jul 2011 14:08:30 +0000 (07:08 -0700)]
is_valid_package_atom: fix circular import

Due to a quirk in python import behavior, this only failed
nondeterministically. However, the new preinst sanity test in the
portage-9999 ebuild tends to trigger it more often for some people.

13 years agoRemove unused codecs import.
Zac Medico [Mon, 11 Jul 2011 00:12:49 +0000 (17:12 -0700)]
Remove unused codecs import.

13 years agoMigrate from codecs.open() to io.open().
Zac Medico [Sun, 10 Jul 2011 23:26:24 +0000 (16:26 -0700)]
Migrate from codecs.open() to io.open().

The io.open() function is the same as the built-in open() function in
python3, and its implementation is optimized in python-2.7 and later.
In addition to the possible performance improvement, this also allows
us to avoid any future compatibility issues with codecs.open() that
may arise if it is delegated to the built-in open() function as
discussed in PEP 400.

The main caveat involved with io.open() is that TextIOWrapper.write()
raises TypeError if given raw bytes, unlike the streams returned from
codecs.open(). This is mainly an issue for python2 since literal
strings are raw bytes. We handle this by wrapping TextIOWrapper.write()
arguments with our _unicode_decode() function. Also, the
atomic_ofstream class overrides the write() method in python2 so that
it performs automatic coercion to unicode when necessary.

13 years agoManifest: fix NameError in updateAllHashes
Zac Medico [Sun, 10 Jul 2011 23:40:56 +0000 (16:40 -0700)]
Manifest: fix NameError in updateAllHashes

13 years agocircular_dependency: fix total_flags calc
Zac Medico [Sun, 10 Jul 2011 13:33:23 +0000 (06:33 -0700)]
circular_dependency: fix total_flags calc

13 years agodepgraph: more debug output for _add_pkg
Zac Medico [Sun, 10 Jul 2011 12:23:24 +0000 (05:23 -0700)]
depgraph: more debug output for _add_pkg

This should make it easier to debug cases like bug 374423,
among others.

13 years agoslot_collision: fix more for bug 374423
Zac Medico [Sun, 10 Jul 2011 12:05:58 +0000 (05:05 -0700)]
slot_collision: fix more for bug 374423

13 years agoslot_collision: fix AttributeError for bug 374423
Zac Medico [Sun, 10 Jul 2011 10:40:59 +0000 (03:40 -0700)]
slot_collision: fix AttributeError for bug 374423

13 years agodepgraph: reject USE conditionals in arguments
Zac Medico [Sun, 10 Jul 2011 03:24:49 +0000 (20:24 -0700)]
depgraph: reject USE conditionals in arguments

13 years agocircular_dependency: fix REQUIRED_USE test
Zac Medico [Sun, 10 Jul 2011 01:57:50 +0000 (18:57 -0700)]
circular_dependency: fix REQUIRED_USE test

13 years agocircular_dependency: fix ridiculously long loop
Zac Medico [Sun, 10 Jul 2011 01:26:26 +0000 (18:26 -0700)]
circular_dependency: fix ridiculously long loop

The flags from REQUIRED_USE were added to affecting_use, which was not
really necessary and was a bad idea because a number of flags in
affecting_use affects our number of loops exponentially. This will fix
bug #374397 in which the large number of flags in the REQUIRED_USE of
dev-lang/php-5.3.6-r1 triggered execution of 2 ^ 45 loops.

13 years agoslot_collision: be consistent with missing IUSE
Zac Medico [Sun, 10 Jul 2011 00:51:06 +0000 (17:51 -0700)]
slot_collision: be consistent with missing IUSE

Special handling for missing IUSE that was introduced in commit
9a193d42032005396800eb30e550691513529c79 is also useful in one
more spot.

13 years agocircular_dependency: show debug graph earlier
Zac Medico [Sat, 9 Jul 2011 22:54:47 +0000 (15:54 -0700)]
circular_dependency: show debug graph earlier

This might help in some cases like bug 374397 where we're
troubleshooting the circular_dependency code.

13 years agocircular_dependency: use itertools.product()
Zac Medico [Sat, 9 Jul 2011 22:23:52 +0000 (15:23 -0700)]
circular_dependency: use itertools.product()

Python's cartesian product function does exactly what we want, so use
it to simplify our code.

13 years agodepgraph: include pkg.repo in debug output
Zac Medico [Sat, 9 Jul 2011 20:12:57 +0000 (13:12 -0700)]
depgraph: include pkg.repo in debug output

13 years agoAdd QA Notice for hasq/useq calls (bug #199722).
Zac Medico [Fri, 8 Jul 2011 17:22:46 +0000 (10:22 -0700)]
Add QA Notice for hasq/useq calls (bug #199722).

13 years agoRemove all hasq/useq calls for bug #199722.
Zac Medico [Fri, 8 Jul 2011 17:14:51 +0000 (10:14 -0700)]
Remove all hasq/useq calls for bug #199722.

13 years agoebuild.5: remove hasq docs for bug #199722
Zac Medico [Fri, 8 Jul 2011 16:56:53 +0000 (09:56 -0700)]
ebuild.5: remove hasq docs for bug #199722

13 years agoInvert has/hasq and use/useq implementations.
Zac Medico [Fri, 8 Jul 2011 16:54:09 +0000 (09:54 -0700)]
Invert has/hasq and use/useq implementations.

We need to migrate away from hasq and useq since they are deprecated
(bug #199722).

13 years agoRepoConfig: ignore missing name if no location
Zac Medico [Fri, 8 Jul 2011 16:36:17 +0000 (09:36 -0700)]
RepoConfig: ignore missing name if no location

This happens if there is an orphan entry in repos.conf.

13 years agogetportageversion: omit implicit -r0 for libc
Zac Medico [Fri, 8 Jul 2011 16:16:39 +0000 (09:16 -0700)]
getportageversion: omit implicit -r0 for libc

13 years agoQualify "missed update" message as WARNING.
Zac Medico [Fri, 8 Jul 2011 10:06:39 +0000 (03:06 -0700)]
Qualify "missed update" message as WARNING.

13 years agorepoman: tighten regex for useq and hasq
Zac Medico [Fri, 8 Jul 2011 08:07:51 +0000 (01:07 -0700)]
repoman: tighten regex for useq and hasq

13 years agorepoman: centralize code for ignoring comments
Zac Medico [Fri, 8 Jul 2011 07:47:31 +0000 (00:47 -0700)]
repoman: centralize code for ignoring comments

13 years agorepoman: check for deprecated useq and hasq calls
Dane Smith [Fri, 8 Jul 2011 07:12:33 +0000 (00:12 -0700)]
repoman: check for deprecated useq and hasq calls

13 years agocpv_expand: fix KeyError when settings is None
Zac Medico [Fri, 8 Jul 2011 06:46:28 +0000 (23:46 -0700)]
cpv_expand: fix KeyError when settings is None

13 years agoRemove the _ensure_encodings module.
Zac Medico [Thu, 7 Jul 2011 19:10:08 +0000 (12:10 -0700)]
Remove the _ensure_encodings module.

This was only needed for ancient versions of python built with
USE=build since the ebuilds used to remove the encodings module in
that case. Since the StreamWriter and StreamReader classes may be
deprecated in the near future, now would be a good time to stop
using them.

13 years agologrotate.d: su portage portage
Zac Medico [Thu, 7 Jul 2011 17:43:13 +0000 (10:43 -0700)]
logrotate.d: su portage portage

This is required for logrotate-3.8.0 as reported in bug 374287.

13 years agoebuild(1): allow-missing-manifests for fetch
Zac Medico [Thu, 7 Jul 2011 17:20:58 +0000 (10:20 -0700)]
ebuild(1): allow-missing-manifests for fetch

13 years agomake.conf.5: fix grammar
Zac Medico [Thu, 7 Jul 2011 08:10:15 +0000 (01:10 -0700)]
make.conf.5: fix grammar

13 years agodigestcheck: more allow-missing-manifests
Zac Medico [Thu, 7 Jul 2011 07:00:04 +0000 (00:00 -0700)]
digestcheck: more allow-missing-manifests

13 years agodigestcheck: support allow-missing-manifests
Zac Medico [Thu, 7 Jul 2011 04:35:45 +0000 (21:35 -0700)]
digestcheck: support allow-missing-manifests

Also, update the man page.

13 years agoadd FEATURES=allow-missing-manifests
Brian Harring [Thu, 7 Jul 2011 00:35:10 +0000 (17:35 -0700)]
add FEATURES=allow-missing-manifests

The feature is as it sounds- primarily useful for temporary
trees or instances where manifests aren't used.

Signed-off-by: Brian Harring <ferringb@gmail.com>
13 years agorepoman: ElementTree.ParseError -> SyntaxError
Zac Medico [Sun, 3 Jul 2011 15:52:37 +0000 (08:52 -0700)]
repoman: ElementTree.ParseError -> SyntaxError

The ElementTree.ParseError class is undocumented and isn't available
in python-2.6, so use its SyntaxError base class instead.

13 years agoShow repository in error message about missing USE flags.
Arfrever Frehtes Taifersar Arahesis [Sun, 3 Jul 2011 11:09:08 +0000 (13:09 +0200)]
Show repository in error message about missing USE flags.

13 years agoportageq get_repo_path: output empty if unknown v2.2.0_alpha43
Zac Medico [Fri, 1 Jul 2011 13:27:27 +0000 (06:27 -0700)]
portageq get_repo_path: output empty if unknown

It used to output "None" for unknown repos, which was not intended.

13 years agoFix a typo in a comment.
Zac Medico [Fri, 1 Jul 2011 08:50:07 +0000 (01:50 -0700)]
Fix a typo in a comment.

13 years agovarexpand: remove escaped newline characters
Zac Medico [Fri, 1 Jul 2011 08:47:14 +0000 (01:47 -0700)]
varexpand: remove escaped newline characters

This fixes a regression reported in bug 365033, comment #14.

13 years agopreserve-libs: only preserve soname symlinks v2.2.0_alpha42
Zac Medico [Fri, 1 Jul 2011 04:00:52 +0000 (21:00 -0700)]
preserve-libs: only preserve soname symlinks

This avoids calling the LinkageMapELF.isMasterLink() method, since the
only symlinks that are strictly required are the soname symlinks.

13 years agoLinkageMapElf.findConsumers(): fix $ROOT handling
Zac Medico [Fri, 1 Jul 2011 02:23:23 +0000 (19:23 -0700)]
LinkageMapElf.findConsumers(): fix $ROOT handling

The code which checks the soname symlink was missing a join with
$ROOT.

13 years agoLinkageMapElf: clarify findConsumers soname code
Zac Medico [Fri, 1 Jul 2011 02:19:14 +0000 (19:19 -0700)]
LinkageMapElf: clarify findConsumers soname code

Here it referred to an soname symlink as a "master" link, which was
inconsistent with the meaning of "master" link used in the
isMasterLink() method.

13 years agoLinkageMapElf.isMasterLink(): handle libproc
Zac Medico [Fri, 1 Jul 2011 01:33:22 +0000 (18:33 -0700)]
LinkageMapElf.isMasterLink(): handle libproc

The version component of the libproc-3.2.8.so soname is formed
slightly differently than most other libraries.

13 years agoUseFlagDisplay: fix USE_EXPAND_HIDDEN breakage
Zac Medico [Thu, 30 Jun 2011 13:10:57 +0000 (06:10 -0700)]
UseFlagDisplay: fix USE_EXPAND_HIDDEN breakage

13 years agoFix a typo in a comment.
Zac Medico [Thu, 30 Jun 2011 12:49:18 +0000 (05:49 -0700)]
Fix a typo in a comment.

13 years agoFix a typo in a docstring.
Zac Medico [Thu, 30 Jun 2011 10:17:31 +0000 (03:17 -0700)]
Fix a typo in a docstring.

13 years agoLinkageMapELF.isMasterLink(): literally compare
Zac Medico [Thu, 30 Jun 2011 10:01:06 +0000 (03:01 -0700)]
LinkageMapELF.isMasterLink(): literally compare

Comparing the lengths of the names alone seems like too much of an
assumption, so literally compare the beginning of the soname to the
basename of the given file.