Fix for =category/package-version* (asterick handling) v2.1.20
authorMike Pagano <mpagano@gentoo.org>
Tue, 12 Jan 2016 18:05:57 +0000 (13:05 -0500)
committerMike Pagano <mpagano@gentoo.org>
Tue, 12 Jan 2016 18:05:57 +0000 (13:05 -0500)
portpeek

index 3fe2b6c..9edf335 100755 (executable)
--- a/portpeek
+++ b/portpeek
@@ -16,7 +16,7 @@
 
 __author__ = "Michael Pagano"
 __email__ = "mpagano@gentoo.org"
-__version__ = "2.1.19"
+__version__ = "2.1.20"
 __productname__ = "portpeek"
 __description__ = "Displays user unmasked ebuilds and installable options from the portage tree"
 
@@ -182,8 +182,8 @@ def parse_line(line, filename):
     if ( (re.search(pattern,line) != None) ):
         special_line = True
 
-    if ( line.find("*") > 0 ) or ( line.find("<") >= 0 ):
-        has_asterick = True
+    if check_pkg.endswith('*'):                                                                                                               
+        has_asterick = True 
 
     print_output(debug,portage.output.blue("Analyzing line: " + line))
 
@@ -316,7 +316,7 @@ def parse_line(line, filename):
                             # package is in package.unmask unnecessarily
                             ebuild_output = portage.output.yellow("\n" + orig_pkg_name  + ": ") + portage.output.green("Not package masked")
                             if "package.unmask" in filename:
-                                unmask_list.append(str(current_package.cpv))
+                                unmask_list.append(orig_pkg_name)
                                 print_output (info, "" +  ebuild_output,None, filename)
                                 continue