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

diff --git a/bin/emerge b/bin/emerge
index b4a1ba630b654981adbd70598c29fbea17751849..7c59ece9ae42d30e01dbf275649c7f508cc1d8c1 100755 (executable)
--- 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" % (