[csw-devel] SF.net SVN: gar:[3911] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 3911
          http://gar.svn.sourceforge.net/gar/?rev=3911&view=rev
Author:   dmichelsen
Date:     2009-03-24 16:30:22 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
mGAR v2: Allow special characters like '+' in catalog names. This fixes #2690650

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/pathfilter
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/bin/pathfilter
===================================================================
--- csw/mgar/gar/v2/bin/pathfilter	2009-03-24 15:04:00 UTC (rev 3910)
+++ csw/mgar/gar/v2/bin/pathfilter	2009-03-24 16:30:22 UTC (rev 3911)
@@ -14,7 +14,7 @@
 #   excluded also.
 
 use strict;
-use Getopt::Long;
+use Getopt::Long qw(:config no_ignore_case);
 use Pod::Usage;
 
 my $help = 0;
@@ -26,7 +26,9 @@
 	'h|help' => \$help,
 	'e|isaexec=s' => \@isaexec,
 	'i|include=s' => sub { push @selection, [ 'i', $_[1] ]; $hasinclude = 1 },
+	'I=s' => sub { push @selection, [ 'i', quotemeta( $_[1] ) ]; $hasinclude = 1 },
 	'x|exclude=s' => sub { push @selection, [ 'x', $_[1] ]; $hasexclude = 1 },
+	'X=s' => sub { push @selection, [ 'x', quotemeta( $_[1] ) ]; $hasexclude = 1 },
 ) or pod2usage( 1 );
 
 # Exclude everything by default if there are only include rules
@@ -153,11 +155,20 @@
 
 Excludes the path from the resulting prototype.
 
+=item B<-X <path>>
+
+Excludes the path from the resulting prototype where all meta characters are quoted.
+
 =item B<-i | --include <path>>
 
 Includes the path in the resulting prototype.
 All pathes are implicitly excluded by default if B<-i> is used.
 
+=item B<-I <path>>
+
+Includes the path in the resulting prototype where all meta characters are quoted.
+All pathes are implicitly excluded by default if B<-i> is used.
+
 =back
 
 =head1 DESCRIPTION

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-03-24 15:04:00 UTC (rev 3910)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-03-24 16:30:22 UTC (rev 3911)
@@ -241,8 +241,8 @@
 	      -n "$(_PKGFILES_EXCLUDE)" -o \
 	      -n "$(ISAEXEC_FILES_$*)" -o \
 	      -n "$(ISAEXEC_FILES)" ]; then \
-	  (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-i $(call licensedir,$*)/license) \
-		      $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-x $(call licensedir,$S)/license) \
+	  (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \
+		      $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \
 		      $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \
 		      $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \
 	              $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.