creatensis.pl: support for excluding packages (including their dependencies)

jef-n · jef-n · commit b578fc14f83d · 2015-08-20T09:57:49.000+02:00
diff --git a/ms-windows/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl
@@ -102,12 +102,22 @@
 my %pkgs;
 
 sub getDeps {
-	my ($pkg) = @_;
-
-	return if exists $pkgs{$pkg};
-
-	print " Including package $pkg\n" if $verbose;
-	$pkgs{$pkg} = 1;
+	my $pkg = shift;
+
+	my $deponly = $pkg =~ /-$/;
+	$pkg =~ s/-$//;
+
+	unless($deponly) {
+		return if exists $pkgs{$pkg};
+		print " Including package $pkg\n" if $verbose;
+		$pkgs{$pkg} = 1;
+	} elsif( exists $pkgs{$pkg} ) {
+		print " Excluding package $pkg\n" if $verbose;
+		delete $pkgs{$pkg};
+		return;
+	} else {
+		print " Including dependencies of package $pkg\n" if $verbose;
+	}
 
 	foreach my $p ( @{ $dep{$pkg} } ) {
 		getDeps($p);
@@ -461,4 +471,5 @@ =head1 SYNOPSIS
   If no packages are given 'qgis-full' and it's dependencies will be retrieved
   and packaged.
 
+  Packages with a appended '-' are excluded, but their dependencies are included.
 =cut
