svn commit: r397055 - head/ports-mgmt/pkg_cutleaves/files

Muhammad Moinur Rahman bofh at FreeBSD.org
Wed Sep 16 11:17:21 UTC 2015


Author: bofh
Date: Wed Sep 16 11:17:20 2015
New Revision: 397055
URL: https://svnweb.freebsd.org/changeset/ports/397055

Log:
  ports-mgmt/pkg_cutleaves: Fix exclude list REGEXP
  
  Submitted by:	cejkar at fit.vutbr.cz

Modified:
  head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves

Modified: head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves
==============================================================================
--- head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves	Wed Sep 16 11:10:23 2015	(r397054)
+++ head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves	Wed Sep 16 11:17:20 2015	(r397055)
@@ -286,7 +286,7 @@ sub set_excl_pattern {
   $exclpattern = @excludes 
     ? join('|', map{qr(\Q$_\E)} @excludes) 
     : ' '; # default non-exclusive 
-  $exclpattern = qr{^($exclpattern)}o;
+  $exclpattern = qr{^($exclpattern)$}o;
 }
 
 #
@@ -317,7 +317,7 @@ sub get_excludelist {
 #
 sub get_packages {
   my @pkgs;
-  open(PKGQUERY, '-|', @pkgquery, '-a', '%n-%v\t%?r\t%c')
+  open(PKGQUERY, '-|', @pkgquery, '-a', '%n\t%n-%v\t%?r\t%c')
     or die "Couldn't read output from $pkgquery[0]!";
   while (my $p = <PKGQUERY>) {
     chomp($p);
@@ -334,9 +334,9 @@ sub get_leaves {
   my %leaves;
   my @pkgs = get_packages(); 
   foreach my $pkg (@pkgs) {
-    my ($file, $required, $comment) = @$pkg;
+    my ($name, $file, $required, $comment) = @$pkg;
     unless ($required) {
-      if ($file =~ $exclpattern) {
+      if ($name =~ $exclpattern) {
         $leavestokeep{$file} = 1;
       }
       else {


More information about the svn-ports-all mailing list