Author: eelco
Date: Sun Jul 31 23:24:08 2011
New Revision: 28026
URL: https://svn.nixos.org/websvn/nix/?rev=28026&sc=1
Log:
* Fix patch generation. It was broken because of the removal of the
"local paths" feature from NixManifests.pm.
Modified:
release/trunk/channels/mirror-channel.pl
Modified: release/trunk/channels/mirror-channel.pl
==============================================================================
--- release/trunk/channels/mirror-channel.pl Sun Jul 31 22:17:29 2011
(r28025)
+++ release/trunk/channels/mirror-channel.pl Sun Jul 31 23:24:08 2011
(r28026)
@@ -57,10 +57,9 @@
# 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 @@
# 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 @@
# 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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
