Print filename when displaying package.mask comments

svn path=/main/trunk/; revision=5974

diff --git a/bin/emerge b/bin/emerge
index 59652958e3dd9ba0cf0d8a22ba2b048f669ad60a..389c4722209f045dc363c70dd62c8023d1459aa4 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1673,9 +1673,10 @@ class depgraph:
                                                                mreasons = portage.getmaskingstatus(p,
                                                                        settings=pkgsettings, portdb=portdb)
                                                                print "- "+p+" (masked by: "+", ".join(mreasons)+")"
-                                                               comment = portage.getmaskingreason(p,
-                                                                       settings=pkgsettings, portdb=portdb)
+                                                               comment, filename = portage.getmaskingreason(p,
+                                                                       settings=pkgsettings, portdb=portdb, return_location=True)
                                                                if comment and comment != oldcomment:
+                                                                       print filename+":"
                                                                        print comment
                                                                        oldcomment = comment
                                                        print

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1461ce7f233f4b463fc8024e6ce3315bed7362f4..7741920449d1d116abb48cc005774cdb4c3376e8 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4400,7 +4400,7 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None):
        else:
                return mykey
 
-def getmaskingreason(mycpv, settings=None, portdb=None):
+def getmaskingreason(mycpv, settings=None, portdb=None, return_location=False):
        from portage.util import grablines
        if settings is None:
                settings = globals()["settings"]
@@ -4423,11 +4423,7 @@ def getmaskingreason(mycpv, settings=None, portdb=None):
        locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
                USER_CONFIG_PATH.lstrip(os.path.sep)))
        locations.reverse()
-       pmasklists = [grablines(os.path.join(x, "package.mask"), recursive=1) for x in locations]
-       pmasklines = []
-       while pmasklists: # stack_lists doesn't preserve order so it can't be used
-               pmasklines.extend(pmasklists.pop(0))
-       del pmasklists
+       pmasklists = [(x, grablines(os.path.join(x, "package.mask"), recursive=1)) for x in locations]
 
        if settings.pmaskdict.has_key(mycp):
                for x in settings.pmaskdict[mycp]:
@@ -4435,22 +4431,27 @@ def getmaskingreason(mycpv, settings=None, portdb=None):
                                comment = ""
                                l = "\n"
                                comment_valid = -1
-                               for i in xrange(len(pmasklines)):
-                                       l = pmasklines[i].strip()
-                                       if l == "":
-                                               comment = ""
-                                               comment_valid = -1
-                                       elif l[0] == "#":
-                                               comment += (l+"\n")
-                                               comment_valid = i + 1
-                                       elif l == x:
-                                               if comment_valid != i:
+                               for pmask in pmasklists:
+                                       pmask_filename = os.path.join(pmask[0], "package.mask")
+                                       for i in xrange(len(pmask[1])):
+                                               l = pmask[1][i].strip()
+                                               if l == "":
                                                        comment = ""
-                                               return comment
-                                       elif comment_valid != -1:
-                                               # Apparently this comment applies to muliple masks, so
-                                               # it remains valid until a blank line is encountered.
-                                               comment_valid += 1
+                                                       comment_valid = -1
+                                               elif l[0] == "#":
+                                                       comment += (l+"\n")
+                                                       comment_valid = i + 1
+                                               elif l == x:
+                                                       if comment_valid != i:
+                                                               comment = ""
+                                                       if return_location:
+                                                               return (comment, pmask_filename)
+                                                       else:
+                                                               return comment
+                                               elif comment_valid != -1:
+                                                       # Apparently this comment applies to muliple masks, so
+                                                       # it remains valid until a blank line is encountered.
+                                                       comment_valid += 1
        return None
 
 def getmaskingstatus(mycpv, settings=None, portdb=None):