The following commit has been merged in the master branch:
commit a452586c5b0fd1473f5b8c1684e2d9156d1d3acb
Author: Mike Gabriel <[email protected]>
Date: Fri Aug 11 23:39:29 2017 -0400
blend-gen-control with no -D (nodepends) set: Set (= ) for arch:all tasks
packages, set under as dependency. Implement missinglist feature for non-set
nodepends flag.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index d0e8d33..1eb4fe0 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -266,10 +266,41 @@ sub gen_control {
if @suggests_sorted;
}
else {
- for $header (qw(Depends Recommends Suggests)) {
- print "$header: ", join(",\n ", sort_uniq(\%seenlist,
@{$taskinfo{$task}{$header}})),"\n"
- if defined $taskinfo{$task}{$header};
+ my $pkglist;
+ my $missinglist;
+ if (defined $taskinfo{$task}{Depends})
+ {
+ ($pkglist, $missinglist) =
process_pkglist(join(",",@{$taskinfo{$task}{Depends}}));
}
+
+ my (@depends, @recommends, @suggests);
+
+ push @depends, $tasksname.' (= {$source:Version})';
+ push @depends, '${misc:Depends}';
+ push @depends, @{$pkglist}
+ if defined $pkglist;
+
+ push @recommends, @{$taskinfo{$task}{Recommends}}
+ if defined $taskinfo{$task}{Recommends};
+
+ push @suggests, @{$missinglist}
+ if defined $missinglist;
+ push @suggests, @{$taskinfo{$task}{Suggests}}
+ if defined $taskinfo{$task}{Suggests};
+
+ my @depends_sorted = sort_uniq(\%seenlist, @depends);
+ my @recommends_sorted = sort_uniq(\%seenlist, @recommends);
+ my @suggests_sorted = sort_uniq(\%seenlist, @suggests);
+
+ print("Depends: ",
+ join(",\n ", @depends_sorted),"\n")
+ if @depends_sorted;
+ print("Recommends: ",
+ join(",\n ", @recommends_sorted),"\n")
+ if @recommends_sorted;
+ print("Suggests: ",
+ join(",\n ", @suggests_sorted),"\n")
+ if @suggests_sorted;
}
# Description Description-long
--
Git repository for blends code
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
