X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=cd2db3acc1964e079181d969db8da869f91429f6;hb=3cab6a27680b24b57bc5da8f8e854be0af143a3e;hp=8065a2ced78debbcd9df4ca0be1c90f5d93cdf5a;hpb=bc36af551cb06ca149f1ef5674efeef802c24b4e;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 8065a2c..cd2db3a 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -275,7 +275,7 @@ if (!isin ( $op_mode, qw(list) ) && ( ($distribution//"") =~ /[ ,]/)) { if ($verbose) { my $version = '$Revision: db181a534e9d $ $Date: 2008/03/26 06:20:22 $ $Author: rmurray $'; $version =~ s/(^\$| \$ .*$)//g; - print "wanna-build $version for $distribution on $arch\n"; + print "wanna-build $version for ".($distribution//"sid")." on $arch\n"; } if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import export @@ -1561,7 +1561,7 @@ sub build_deplist { sub filterarch { return "" unless $_[0]; - return Dpkg::Deps::parse($_[0], ("reduce_arch" => 1, "host_arch" => $_[1]))->dump(); + return Dpkg::Deps::deps_parse($_[0], ("reduce_arch" => 1, "host_arch" => $_[1]))->output(); } sub wb_edos_builddebcheck { @@ -1608,9 +1608,9 @@ sub wb_edos_builddebcheck { } } - print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)."\n"; + print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" -I ".$_ } @$packagefiles)."\n"; open(my $result_cmd, '-|', - "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)); + "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" -I ".$_ } @$packagefiles)); my $explanation=""; my $result={};