* If a patch already exists, it must still be included in the manifest.
This commit is contained in:
		
							parent
							
								
									35b76a81c4
								
							
						
					
					
						commit
						c53898cb65
					
				
					 1 changed files with 12 additions and 9 deletions
				
			
		|  | @ -215,12 +215,13 @@ foreach my $p (keys %dstOutPaths) { | ||||||
|         my $finalName = |         my $finalName = | ||||||
|             "$narDiffHash-$name-$closestVersion-to-$version.nar-bsdiff"; |             "$narDiffHash-$name-$closestVersion-to-$version.nar-bsdiff"; | ||||||
| 
 | 
 | ||||||
|  |         print "    size $narDiffSize; full size $dstNarBz2Size\n"; | ||||||
|  |          | ||||||
|         if (-e "$patchesDir/$finalName") { |         if (-e "$patchesDir/$finalName") { | ||||||
|             print "    not copying, already exists\n"; |             print "    not copying, already exists\n"; | ||||||
|             next; |  | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         print "    size $narDiffSize; full size $dstNarBz2Size\n"; |         else { | ||||||
| 
 | 
 | ||||||
|             system("cp '$tmpdir/DIFF' '$patchesDir/$finalName.tmp'") == 0 |             system("cp '$tmpdir/DIFF' '$patchesDir/$finalName.tmp'") == 0 | ||||||
|                 or die "cannot copy diff"; |                 or die "cannot copy diff"; | ||||||
|  | @ -228,6 +229,8 @@ foreach my $p (keys %dstOutPaths) { | ||||||
|             rename("$patchesDir/$finalName.tmp", "$patchesDir/$finalName") |             rename("$patchesDir/$finalName.tmp", "$patchesDir/$finalName") | ||||||
|                 or die "cannot rename $patchesDir/$finalName.tmp"; |                 or die "cannot rename $patchesDir/$finalName.tmp"; | ||||||
|              |              | ||||||
|  |         } | ||||||
|  |          | ||||||
|         # Add the patch to the manifest. |         # Add the patch to the manifest. | ||||||
|         addPatch \%dstPatches, $p, |         addPatch \%dstPatches, $p, | ||||||
|             { url => "$patchesURL/$finalName", hash => $narDiffHash |             { url => "$patchesURL/$finalName", hash => $narDiffHash | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue