From 50a70cd428e114eb6928ce48484a134ff2be3f6b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 31 Jul 2011 23:24:08 +0000 Subject: [PATCH] * Fix patch generation. It was broken because of the removal of the "local paths" feature from NixManifests.pm. git-svn-id: https://nixos.org/repos/nix/release/trunk/channels@28026 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb --- mirror-channel.pl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mirror-channel.pl b/mirror-channel.pl index 81b9f65..3e0de4a 100644 --- a/mirror-channel.pl +++ b/mirror-channel.pl @@ -57,10 +57,9 @@ if (-f $manifestPath && ! -f $backupPath) { # Read the old manifest, if available. my %narFilesOld; -my %localPathsOld; my %patchesOld; -readManifest($manifestPath, \%narFilesOld, \%localPathsOld, \%patchesOld) +readManifest($manifestPath, \%narFilesOld, \%patchesOld) if -f $manifestPath; my %knownURLs; @@ -75,10 +74,9 @@ system("$curl '$srcChannelURL/MANIFEST' > $srcManifest") == 0 or die; # Read the manifest. -my (%narFiles, %localPaths, %patches); -readManifest($srcManifest, \%narFiles, \%localPaths, \%patches); +my (%narFiles, %patches); +readManifest($srcManifest, \%narFiles, \%patches); -%localPaths = (); %patches = (); # not supported yet my $size = scalar (keys %narFiles); @@ -203,7 +201,7 @@ if ($enablePatches) { # Rewrite the manifest. We have to reread it and propagate all # patches because it may have changed in the meantime. - readManifest($manifestPath, \%narFiles, \%localPaths, \%patches); + readManifest($manifestPath, \%narFiles, \%patches); propagatePatches \%allPatches, \%narFiles, \%patches;