From e7f741df9cbb0657a5bb2420d3e92abbe2524df0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Feb 2012 00:29:55 +0000
Subject: [PATCH] remove spurious debug; fixes

---
 Topbloke.pm | 13 ++++---------
 tb-list.pl  |  4 ----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Topbloke.pm b/Topbloke.pm
index ec929ff..5ea0ae7 100644
--- a/Topbloke.pm
+++ b/Topbloke.pm
@@ -11,8 +11,6 @@ use IPC::Open2;
 use File::Path qw(make_path remove_tree);
 use File::Basename;
 
-use Data::Dumper;
-
 BEGIN {
     use Exporter   ();
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
@@ -416,7 +414,6 @@ sub patch_matches_spec ($$) {
 
 sub foreach_patch ($$$$) {
     my ($spec, $deleted_ok, $want, $body) = @_;
-print STDERR Dumper(\@_);
     # runs $body->($patch, $parsedname, \%meta)
     # where $meta{<metadata filename>} is, for <metadata filename> in @$want:
     #              undefined if metadata file doesn't exist
@@ -442,16 +439,14 @@ print STDERR Dumper(\@_);
 	my $parsedname;
 	my $patch = substr($',19); #');
 	my $wantix = 0;
-print STDERR Dumper(\@want);
 	foreach my $wantent (@want) {
 	    my $file = $wantent;
 	    my $stripnl = ($file =~ s/_$//);
+	    my $key = $file;
 	    my $inbase = ($file =~ s/^B_//);
 
 	    if ($file eq ' patch') {
-print STDERR "has spc patch\n";
 		if ($spec) {
-print STDERR "hasspec\n";
 		    $parsedname = parse_patch_name($patch);
 		    if (!patch_matches_spec($parsedname, $spec)) {
 			debug("foreach_patch  mismatch");
@@ -462,12 +457,12 @@ print STDERR "hasspec\n";
 	    }
 
 	    my $objkey = (!$inbase ? "$objname" : 
-			  "refs/topbloke-bases/$patch").":.topbloke/$file";
+			  "$baserefs/$patch").":.topbloke/$file";
 	    my ($got, $data) = git_get_object($objkey);
 	    if ($got eq 'missing') {
-		$meta{$file} = undef;
+		$meta{$key} = undef;
 	    } elsif ($got eq 'blob') {
-		$meta{$file} = $data;
+		$meta{$key} = $data;
 		if ($file eq 'deleted' && !$deleted_ok) {
 		    debug("foreach_patch  Deleted");
 		    return;
diff --git a/tb-list.pl b/tb-list.pl
index e31304a..c23f6a0 100755
--- a/tb-list.pl
+++ b/tb-list.pl
@@ -57,15 +57,11 @@ foreach $sort (@sort) {
 
 our %patches;
 
-use Data::Dumper;
-
 foreach_patch($relatedto || $leaves || !$spec ? { } : $spec, 
 	      $deleted || $deleted_only, 
 	      [qw(B_deps +included)],
 	      sub { 
 		  my ($patch,$parsedname,$meta) = @_;
-
-print Dumper($parsedname);
 		  $patches{$patch}{Meta} = $meta;
 		  $patches{$patch}{ParsedName} = $parsedname;
 		  $patches{$patch}{Deps} =
-- 
2.30.2