the-distro/channel-scripts
1
0
Fork 1
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

* Fix patch generation. It was broken because of the removal of the

Browse source 
"local paths" feature from NixManifests.pm.


git-svn-id: https://nixos.org/repos/nix/release/trunk/channels@28026 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
This commit is contained in:
Eelco Dolstra 2011-07-31 23:24:08 +00:00
parent c850f595bc
commit 50a70cd428
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mirror-channel.pl
View file

@ -57,10 +57,9 @@ if (-f $manifestPath && ! -f $backupPath) {
# Read the old manifest, if available. # Read the old manifest, if available.
my %narFilesOld; my %narFilesOld;
my %localPathsOld;
my %patchesOld; my %patchesOld;
readManifest($manifestPath, \%narFilesOld, \%localPathsOld, \%patchesOld) readManifest($manifestPath, \%narFilesOld, \%patchesOld)
if -f $manifestPath; if -f $manifestPath;
my %knownURLs; my %knownURLs;
@ -75,10 +74,9 @@ system("$curl '$srcChannelURL/MANIFEST' > $srcManifest") == 0 or die;
# Read the manifest. # Read the manifest.
my (%narFiles, %localPaths, %patches); my (%narFiles, %patches);
readManifest($srcManifest, \%narFiles, \%localPaths, \%patches); readManifest($srcManifest, \%narFiles, \%patches);
%localPaths = ();
%patches = (); # not supported yet %patches = (); # not supported yet
my $size = scalar (keys %narFiles); my $size = scalar (keys %narFiles);
@ -203,7 +201,7 @@ if ($enablePatches) {
# Rewrite the manifest. We have to reread it and propagate all # Rewrite the manifest. We have to reread it and propagate all
# patches because it may have changed in the meantime. # patches because it may have changed in the meantime.
readManifest($manifestPath, \%narFiles, \%localPaths, \%patches); readManifest($manifestPath, \%narFiles, \%patches);
propagatePatches \%allPatches, \%narFiles, \%patches; propagatePatches \%allPatches, \%narFiles, \%patches;