[Blends-commit] [SCM] blends-dev branch, master, updated. 65bfff2268dcce1abba377d290c6b3bc13b994ea

Ole Streicher olebole at debian.org
Mon Apr 4 18:40:45 UTC 2016


The following commit has been merged in the master branch:
commit 65bfff2268dcce1abba377d290c6b3bc13b994ea
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Apr 4 20:39:27 2016 +0200

    New header keyword "Install"
    Setting this to false causes the corresponding task not installed by
    debinstaller. Default is true.

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index f9c1681..71f52b1 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -185,10 +185,10 @@ sub gen_control {
     for $task (sort keys %taskinfo) {
         next if (exists $taskinfo{$task}{'Metapackage'} &&
                         $taskinfo{$task}{'Metapackage'} eq 'false');
-	if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 ) {
-	    next ;
-	}
-	push (@list, $task)
+        next if (exists $taskinfo{$task}{'Install'} &&
+                        $taskinfo{$task}{'Install'} eq 'false');
+        next if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 );
+        push (@list, $task)
     }
     print "Recommends: ";
     print join(",\n ", at list);
@@ -515,7 +515,7 @@ sub load_task {
         $line =~ s/\s+$//;
 
         $_ = $line;
-        for my $header (qw(Section Architecture Priority Leaf Enhances Metapackage)) {
+        for my $header (qw(Section Architecture Priority Leaf Enhances Metapackage Install)) {
             $taskinfo{$curpkg}{$header} = $1 if (m/^$header:\s+(.+)$/);
         }
         $taskinfo{$curpkg}{$1} = $2 if (m/^(test-.+):\s+(.+)$/i);

-- 
Git repository for blends code



More information about the Blends-commit mailing list