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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 9987bd1c6f60ca8e4f955d16b784f9284500e152
Author: Ole Streicher <ole at aip.de>
Date:   Tue May 24 12:08:50 2016 +0200

    Install a task in the Debian installer as opt-in instead of opt-out
    This means that a task should have now a "Install: true" in the header field
    for the tasks that should be installed during Debian installation when the
    blend is selected.

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 7b7756c..bd12c3b 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -188,10 +188,10 @@ sub gen_control {
                         $taskinfo{$task}{'Metapackage'} eq 'false');
         next if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 );
         if (exists $taskinfo{$task}{'Install'} &&
-	    $taskinfo{$task}{'Install'} eq 'false') {
-	    push (@suggests, $task)
-	} else {
+	    $taskinfo{$task}{'Install'} eq 'true') {
 	    push (@recommends, $task)
+	} else {
+	    push (@suggests, $task)
 	}
     }
     print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
@@ -319,8 +319,8 @@ sub print_task_desc {
                 print "$taskinfo{$task}{'Description-long'}"; # Already contain newline
                 print "Enhances: $taskinfo{$task}{Enhances}\n"
                     if exists $taskinfo{$task}{Enhances};
-		if (!exists $taskinfo{$task}{'Install'} ||
-		    $taskinfo{$task}{'Install'} ne 'false') {
+		if (exists $taskinfo{$task}{'Install'} &&
+		    $taskinfo{$task}{'Install'} eq 'true') {
 		    print "Test-new-install: mark show\n";
 		}
                 for $header (keys %{$taskinfo{$task}}) {

-- 
Git repository for blends code