diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-30 06:03:46 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-30 06:03:46 -0700 |
| commit | 3c0302e1358ec6b2ab057dab4e06f5a6674d58c1 (patch) | |
| tree | ab4a8276bf1f4f8462ed6cf2596f2854401eb99f | |
| parent | 3f71ffcf6a6f1dc51dc5016c7fd2b8fe89f1b18d (diff) | |
| parent | db301c0d2c935cae83e39ec37de1171f6eb7f913 (diff) | |
| download | portage-3c0302e1358ec6b2ab057dab4e06f5a6674d58c1.tar.gz portage-3c0302e1358ec6b2ab057dab4e06f5a6674d58c1.tar.bz2 portage-3c0302e1358ec6b2ab057dab4e06f5a6674d58c1.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
| -rw-r--r-- | man/emerge.1 | 2 | ||||
| -rw-r--r-- | pym/_emerge/actions.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 0f2360ff0..c2ce11059 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -703,7 +703,7 @@ before they can emerge. Here we see that the make.conf variable \fBUSE\fR affects how this package is built. In this example, ipv6 optional support is enabled and both gtk and qt support are disabled. The asterisk following ipv6 indicates that ipv6 support -was disabled the last time this packages was installed. The percent sign +was disabled the last time this package was installed. The percent sign following qt indicates that the qt option has been added to the package since it was last installed. For information about all \fBUSE\fR symbols, see the \fB\-\-verbose\fR option documentation above. diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 75f15f959..7f585089c 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -882,11 +882,12 @@ def calc_depclean(settings, trees, ldpath_mtimes, cleanlist = create_cleanlist() clean_set = set(cleanlist) + real_vardb = trees[myroot]["vartree"].dbapi if cleanlist and \ real_vardb._linkmap is not None and \ myopts.get('--depclean-lib-check') != 'n': - # Check if any of these package are the sole providers of libraries + # Check if any of these packages are the sole providers of libraries # with consumers that have not been selected for removal. If so, these # packages and any dependencies need to be added to the graph. linkmap = real_vardb._linkmap |