From 581bcb986f22e2d60f2c01b4be27f50d478df587 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 30 Dec 2004 16:34:54 +0000 Subject: [PATCH] * Some logging for evaluation. --- scripts/download-using-manifests.pl.in | 14 ++++++++++++++ scripts/generate-patches.pl | 2 ++ 2 files changed, 16 insertions(+) diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index eee1bdec2..afc0e5009 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -4,12 +4,17 @@ use strict; use readmanifest; my $manifestDir = "@localstatedir@/nix/manifests"; +my $logFile = "@localstatedir@/log/nix/downloads"; + +open LOGFILE, ">>$logFile" or die "cannot open log file $logFile"; # Check the arguments. die unless scalar @ARGV == 1; my $targetPath = $ARGV[0]; +print LOGFILE "$$ get $targetPath\n"; + # Load all manifests. my %narFiles; @@ -175,12 +180,15 @@ while (scalar @path > 0) { if ($edge->{type} eq "present") { print "using already present path `$v'\n"; + print LOGFILE "$$ present $v\n"; } elsif ($edge->{type} eq "patch") { my $patch = $edge->{info}; print "applying patch `$patch->{url}' to `$u' to create `$v'\n"; + print LOGFILE "$$ patch $patch->{url} $patch->{size} $patch->{baseHash} $u $v\n"; + # Download the patch. print " downloading patch...\n"; my $patchPath = downloadFile "$patch->{url}", "$patch->{hash}"; @@ -206,6 +214,8 @@ while (scalar @path > 0) { my $narFile = $edge->{info}; print "downloading `$narFile->{url}' into `$v'\n"; + print LOGFILE "$$ narfile $narFile->{url} $narFile->{size} $v\n"; + # Download the archive. print " downloading archive...\n"; my $narFilePath = downloadFile "$narFile->{url}", "$narFile->{hash}"; @@ -216,3 +226,7 @@ while (scalar @path > 0) { die "cannot unpack `$narFilePath' into `$targetPath'" if ($? != 0); } } + + +print LOGFILE "$$ success\n"; +close LOGFILE; diff --git a/scripts/generate-patches.pl b/scripts/generate-patches.pl index fdbc65ad6..4b91884d0 100755 --- a/scripts/generate-patches.pl +++ b/scripts/generate-patches.pl @@ -219,6 +219,8 @@ foreach my $p (keys %dstOutPaths) { print " not copying, already exists\n"; next; } + + print " size $narDiffSize; full size $dstNarBz2Size\n"; system("cp '$tmpdir/DIFF' '$patchesDir/$finalName.tmp'") == 0 or die "cannot copy diff";