diff options
author | Martin Koegler <mkoegler@auto.tuwien.ac.at> | 2012-06-17 18:56:54 +0200 |
---|---|---|
committer | Stephan Kulow <coolo@suse.de> | 2012-09-24 17:37:45 +0200 |
commit | becc74f49510c15c39a8d59de3bb541c02f53562 (patch) | |
tree | a17a37fc4902bd56c7df5034b324b4d28662070d /debtransform | |
parent | 559c00d9c151281c89b408a57999e21388f94947 (diff) | |
download | build-becc74f49510c15c39a8d59de3bb541c02f53562.tar.gz build-becc74f49510c15c39a8d59de3bb541c02f53562.tar.bz2 build-becc74f49510c15c39a8d59de3bb541c02f53562.zip |
Refactor diff generation
Diffstat (limited to 'debtransform')
-rwxr-xr-x | debtransform | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/debtransform b/debtransform index a314d54..bbb99d8 100755 --- a/debtransform +++ b/debtransform @@ -70,6 +70,15 @@ sub listtar { return @c; } +sub dodiff { + my ($oldname, $newname, @content) = @_; + return unless @content; + print DIFF "--- $oldname\n"; + print DIFF "+++ $newname\n"; + print DIFF "\@\@ -0,0 +1,".scalar(@content)." \@\@\n"; + print DIFF "+$_\n" for @content; +} + sub dotar { my ($tar, $tardir, $origin, @c) = @_; local *F; @@ -84,11 +93,7 @@ sub dotar { } next if $origin && $origin->{$c->{'name'}} ne $tar; my @file = split("\n", $file); - print DIFF "--- $tardir.orig/debian/$c->{'name'}\n"; - print DIFF "+++ $tardir/debian/$c->{'name'}\n"; - next unless @file; - print DIFF "\@\@ -0,0 +1,".scalar(@file)." \@\@\n"; - print DIFF "+$_\n" for @file; + dodiff("$tardir.orig/debian/$c->{'name'}", "$tardir/debian/$c->{'name'}", @file); } close(F); } @@ -100,11 +105,7 @@ sub dofile { my @file = <F>; close F; chomp(@file); - return unless @file; - print DIFF "--- $tardir.orig/$dfile\n"; - print DIFF "+++ $tardir/$dfile\n"; - print DIFF "\@\@ -0,0 +1,".scalar(@file)." \@\@\n"; - print DIFF "+$_\n" for @file; + dodiff("$tardir.orig/$dfile", "$tardir/$dfile", @file); } sub doseries { |