X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=0d24fd1485ddbc0630727b2e95cfabf0be1cdf7a;hb=ea234b3b19c322bfe93298f563091d1c87890420;hp=070009fecb760a32822f775de4c1b34d76be5b5a;hpb=eb1c0170236ade56c2779b406bafe756f05f09a2;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 070009f..0d24fd1 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -1768,9 +1768,9 @@ sub list_packages { next if $category && $pkg->{'state'} eq "Failed" && $pkg->{'failed_category'} ne $category; next if ($list_min_age > 0 && - ($ctime-parse_date($pkg->{'State-Change'})) < $list_min_age)|| + ($ctime-parse_date($pkg->{'state_change'})) < $list_min_age)|| ($list_min_age < 0 && - ($ctime-parse_date($pkg->{'State-Change'})) > -$list_min_age); + ($ctime-parse_date($pkg->{'state_change'})) > -$list_min_age); push( @list, $pkg ); } @@ -1800,7 +1800,7 @@ sub list_packages { join("\n ",split("\n",$pkg->{'bd_problem'})), "\n" if $pkg->{'state'} eq "BD-Uninstallable"; print " Previous state was $pkg->{'previous_state'} until ", - "$pkg->{'State-Change'}\n" + "$pkg->{'state_change'}\n" if $verbose && $pkg->{'previous_state'}; print " No previous state recorded\n" if $verbose && !$pkg->{'previous_state'}; @@ -1843,7 +1843,17 @@ sub info_packages { chomp( $val ); $val = "\n$val" if isin( $key, qw(Failed Old-Failed)); $val =~ s/\n/\n /g; - printf " %-20s: %s\n", $key, $val; + my $print_key = $key; + $print_key = 'Package' if ($key eq 'package'); + $print_key = 'Version' if ($key eq 'version'); + $print_key = 'Builder' if ($key eq 'builder'); + $print_key = 'State' if ($key eq 'state'); + $print_key = 'Section' if ($key eq 'section'); + $print_key = 'Priority' if ($key eq 'priority'); + $print_key = 'Installed-Version' if ($key eq 'installed_version'); + $print_key = 'Previous-State' if ($key eq 'previous_state'); + $print_key = 'State-Change' if ($key eq 'state_change'); + printf " %-20s: %s\n", $print_key, $val; } foreach $key (sort keys %$pkg) { next if isin( $key, @firstkeys ); @@ -1851,7 +1861,20 @@ sub info_packages { chomp( $val ); $val = "\n$val" if isin( $key, qw(Failed Old-Failed)); $val =~ s/\n/\n /g; - printf " %-20s: %s\n", $key, $val; + my $print_key = $key; + $print_key = 'BD-Problem' if ($key eq 'bd_problem'); + $print_key = 'Binary-NMU-Changelog' if ($key eq 'binary_nmu_changelog'); + $print_key = 'Binary-NMU-Version' if ($key eq 'binary_nmu_version'); + $print_key = 'BuildPri' if ($key eq 'buildpri'); + $print_key = 'Depends' if ($key eq 'depends'); + $print_key = 'Failed' if ($key eq 'failed'); + $print_key = 'Failed-Category' if ($key eq 'failed_category'); + $print_key = 'Notes' if ($key eq 'notes'); + $print_key = 'Distribution' if ($key eq 'distribution'); + $print_key = 'Old-Failed' if ($key eq 'old_failed'); + $print_key = 'PermBuildPri' if ($key eq 'permbuildpri'); + $print_key = 'Rel' if ($key eq 'rel'); + printf " %-20s: %s\n", $print_key, $val; } } } @@ -1972,7 +1995,7 @@ sub change_state { return if defined($$state) and $$state eq $newstate; $pkg->{'previous_state'} = $$state if defined($$state); - $pkg->{'State-Change'} = $curr_date; + $pkg->{'state_change'} = $curr_date; if (defined($$state) and $$state eq 'Failed') { $pkg->{'old_failed'} =