]> git.donarmstrong.com Git - wannabuild.git/commitdiff
Remember Build-Deps and Build-Conflicts
authorJoachim Breitner <nomeata@debian.org>
Wed, 29 Jul 2009 17:33:29 +0000 (19:33 +0200)
committerJoachim Breitner <nomeata@debian.org>
Wed, 29 Jul 2009 17:57:12 +0000 (19:57 +0200)
This allows us to generate a minimal Sources file for
edos-builddebcheck, and even when no Sources files are arond.

bin/wanna-build

index adeaf887e6fb402c67bd82a3750c85edad14ad70..693528e58e93d5c21e053b6fc8d3a342c5ed9d11 100755 (executable)
@@ -1219,16 +1219,7 @@ sub parse_sources {
 
                next if (defined $srcver{$name} and version_less( $version, $srcver{$name} ));
                $srcver{$name} = $version;
-               if ($buildconf) {
-                   $buildconf = join( ", ", map { "!$_" } split( /\s*,\s*/, $buildconf ));
-                   if ($builddep) {
-                       $builddep .= "," . $buildconf;
-                   } else {
-                       $builddep = $buildconf;
-                   }
-               }
 
-               $pkgs{$name}{'dep'} = defined $builddep ? $builddep : "";
                $pkgs{$name}{'ver'} = $version;
                $pkgs{$name}{'bin'} = $binaries;
                my $pkg = $db{$name};
@@ -1258,6 +1249,13 @@ sub parse_sources {
 
                        $pkg->{'Section'} = $section, $change++
                                if defined $section and (not defined($pkg->{'Section'}) or $pkg->{'Section'} ne $section);
+
+                       # Store Build-Deps and Build-Conflicts for edos-debcheck later
+                       $pkg->{'Build-Depends'} = $builddep, $change++
+                               if ($pkg->{'Build-Depends'} ne $builddep);
+                       $pkg->{'Build-Conflicts'} = $builddep, $change++
+                               if ($pkg->{'Build-Conflicts'} ne $buildconf);
+
                        $db{$name} = $pkg if $change;
                }
        }