[Blends-commit] [SCM] blends-dev branch, master, updated. 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1

Ole Streicher ole at aip.de
Tue May 24 10:20:12 UTC 2016


The following commit has been merged in the master branch:
commit 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1
Author: Ole Streicher <ole at aip.de>
Date:   Tue May 24 12:16:09 2016 +0200

    Suppress the creation of the <blend>-all package if no task to be installed

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index bd12c3b..ca627e9 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -178,9 +178,6 @@ sub uniq {
 sub gen_control {
     my $task;
 
-    print "Package: $blendshortname-all\n";
-    print "Section: metapackages\n" ;
-    print "Architecture: all\n";
     my @recommends;
     my @suggests;
     for $task (sort keys %taskinfo) {
@@ -194,11 +191,16 @@ sub gen_control {
 	    push (@suggests, $task)
 	}
     }
-    print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
-    print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
-    print "Description: Default selection of tasks for $blendtitle\n";
-    print " This package is part of the $blendtitle Pure Blend and installs all\n";
-    print " tasks for a default installation of this blend.\n\n";
+    if (@recommends) {
+	print "Package: $blendshortname-all\n";
+	print "Section: metapackages\n" ;
+	print "Architecture: all\n";
+	print("Recommends: ", join(",\n ", @recommends),"\n");
+	print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
+	print "Description: Default selection of tasks for $blendtitle\n";
+	print " This package is part of the $blendtitle Pure Blend and installs all\n";
+	print " tasks for a default installation of this blend.\n\n";
+    }
 
     for $task (sort keys %taskinfo) {
         next if (exists $taskinfo{$task}{'Metapackage'} &&

-- 
Git repository for blends code



More information about the Blends-commit mailing list