Ticket #51292: patch-fix-unique-uniquebase.diff

tardiff

@@ -80 +80 @@
 sub analyzetar{
         my $filelist = shift(@_);
         my $filehash = shift(@_);
+        my $tarball = shift(@_);
 
         my %files = %{$filehash};
 
@@ -92 +93 @@
                 if(!$uniquebase){
                         $uniquebase = $base;
                 }else{
-                        ($base eq $uniquebase) or die "$tarball1 contains different base dirs: $base and $uniquebase";
+                        ($base eq $uniquebase) or die "$tarball contains different base dirs: $base and $uniquebase";
                 }
                 if($files{$remainder}){
                         $files{$remainder} = "__both";
                 }else{
-                        $files{$remainder} = "$uniquebase";
+                        $files{$remainder} = "$tarball";
                 }
         }
 
@@ -174 +175 @@
 
         my %files;
 
-        my ($base1, %files) = analyzetar($filelist1, \%files);
-        my ($base2, %files) = analyzetar($filelist2, \%files);
+        my ($base1, %files) = analyzetar($filelist1, \%files, $tarball1);
+        my ($base2, %files) = analyzetar($filelist2, \%files, $tarball2);
 
         foreach my $file(sort(keys(%files))){
                 next if $file eq "";
@@ -196 +197 @@
                         if($opt_list and not $modified){
                                 print "  $file\n";
                         }
-                }elsif($base eq $base1){
+                }elsif($base eq $tarball1){
                         print "- $file\n";
-                }elsif($base eq $base2){
+                }elsif($base eq $tarball2){
                         print "+ $file\n";
                 }else{
                         print "? $file\n";