summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-06 23:02:03 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-06 23:02:03 +0000
commitd5797fcabdf9705662870d5616b45df5917aa17b (patch)
treee5aba3772cddb43abb943018662aced543d134ed
parentbd44f336801fbd818fab568349dc4117950cd051 (diff)
downloadportage-d5797fcabdf9705662870d5616b45df5917aa17b.tar.gz
portage-d5797fcabdf9705662870d5616b45df5917aa17b.tar.bz2
portage-d5797fcabdf9705662870d5616b45df5917aa17b.zip
To avoid false positives during the transition
period, don't show ? if the installed package is missing a repository label. Stages starting with 2007.1 will come with repository lables. svn path=/main/branches/2.1.2/; revision=8855
-rwxr-xr-xbin/emerge8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index b4a1ba630..7c59ece9a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3197,7 +3197,13 @@ class depgraph:
if repo_name_prev:
repo_path_prev = portdb.getRepositoryPath(
repo_name_prev)
- if repo_path_prev == repo_path_real:
+ # To avoid false positives during the transition
+ # period, don't show ? if the installed package
+ # is missing a repository label. Stages starting
+ # with 2007.1 will come with repository lables.
+ ignore_missing_labels = True
+ if (ignore_missing_labels and not repo_path_prev) or \
+ repo_path_prev == repo_path_real:
repoadd = repo_display.repoStr(repo_path_real)
else:
repoadd = "%s=>%s" % (