[backend] BSSrcdiff: handle renamed files with no content change

openSUSE · Nov 14, 2011 · b658e66 · b658e66
1 parent 28ab416
commit b658e66
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/backend/BSSrcdiff.pm b/src/backend/BSSrcdiff.pm
@@ -651,6 +651,12 @@ sub datadiff {
     } elsif ($old->{$of} ne $new->{$f}) {
       if ($opts{'doarchive'} && $f =~ /\.(?:tgz|tar\.gz|tar\.bz2|tbz|tar\.xz)$/) {
 	my @r = tardiff("$pold/$old->{$of}-$of", "$pnew/$new->{$f}-$f", %opts);
+        if (@r == 0 && $f ne $of) {
+	  # (almost) identical tars but renamed
+	  my @os = stat("$pnew/$old->{$of}-$of");
+          my @s = stat("$pnew/$new->{$f}-$f");
+          push @changed, {'state' => 'renamed', 'old' => {'name' => $of, 'md5' => $old->{$of}, 'size' => $os[7]}, 'new' => {'name' => $f, 'md5' => $new->{$f}, 'size' => $s[7]}};
+        }
         if (@r == 1 && !$r[0]->{'old'} && !$r[0]->{'new'}) {
 	  # tardiff was too big
 	  my @os = stat("$pnew/$old->{$of}-$of");
@@ -676,6 +682,10 @@ sub datadiff {
 	delete $r->{'state'};
 	push @changed, {'state' => 'changed', 'diff' => $r, 'old' => {'name' => $of, 'md5' => $old->{$of}, 'size' => $os[7]}, 'new' => {'name' => $f, 'md5' => $new->{$f}, 'size' => $s[7]}};
       }
+    } else {
+      my @os = stat("$pnew/$old->{$of}-$of");
+      my @s = stat("$pnew/$new->{$f}-$f");
+      push @changed, {'state' => 'renamed', 'old' => {'name' => $of, 'md5' => $old->{$of}, 'size' => $os[7]}, 'new' => {'name' => $f, 'md5' => $new->{$f}, 'size' => $s[7]}};
     }
   }
   for my $of (grep {!$done{$_}} sort(keys %$old)) {