From 7eff358f9e25858d466eb90a6b8a77f79ebd5e52 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 30 Aug 2010 14:02:30 +0200 Subject: Bug #335242: Fix typo in emerge(1) man page. --- man/emerge.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3-1-g7c22 From 768b5ed697a7accff7fe86fce31bfefed7d4e8cb Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 30 Aug 2010 14:08:09 +0200 Subject: Fix typo in comment. --- pym/_emerge/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 3c735aa2c..707bb7b41 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -885,7 +885,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, 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. real_vardb = trees[myroot]["vartree"].dbapi -- cgit v1.2.3-1-g7c22 From db301c0d2c935cae83e39ec37de1171f6eb7f913 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 30 Aug 2010 15:02:12 +0200 Subject: Fix "UnboundLocalError: local variable 'real_vardb' referenced before assignment". --- pym/_emerge/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 707bb7b41..5be9a9dc5 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -881,6 +881,7 @@ 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': @@ -888,7 +889,6 @@ def calc_depclean(settings, trees, ldpath_mtimes, # 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. - real_vardb = trees[myroot]["vartree"].dbapi linkmap = real_vardb._linkmap consumer_cache = {} provider_cache = {} -- cgit v1.2.3-1-g7c22