Better error reporting if sync with CPAN fails.

2 files changed, 12 insertions, 4 deletions

diff --git a/preps/perl b/preps/perl
index 5e88b06..90f33d4 100755
--- a/preps/perl
+++ b/preps/perl
@@ -25,12 +25,11 @@ sub matchdist
 		or err('PKGVAR env variable is unset');
 
 	if(!-f "$var/cpan.dists" || -M "$var/cpan.dists" > 1) {
-		print STDERR "$PROG: Refreshing local CPAN data... ";
+		print STDERR "$PROG: Refreshing local CPAN data.\n";
 		my $cwd = getcwd();
 		chdir $var or die "chdir: $!";
 		system 'fetchcpan';
-		die "FAILED\n" unless($? == 0);
-		print STDERR "OK\n";
+		exit 1 unless($? == 0);
 		chdir $cwd or die "chdir: $!";
 	}
 
diff --git a/preps/perl.d/fetchcpan b/preps/perl.d/fetchcpan
index b9ddeaa..dff7873 100755
--- a/preps/perl.d/fetchcpan
+++ b/preps/perl.d/fetchcpan
@@ -3,7 +3,7 @@
 mirror=${CPANMIRROR:-ftp://cpan.pair.com}
 path=/modules/02packages.details.txt.gz
 
-curl --silent "$mirror$path" | gzip -dc | awk '
+curl --silent "$mirror$path" | zcat 2>/dev/null | awk '
 NR < 10 { next }
 {
     file = a[split($3, a, "/")]
@@ -29,6 +29,8 @@ NR < 10 { next }
 }
 
 END {
+    if(NR == 0) exit(1)
+
     for (dist in dists) {
         ver = dists[dist]
         print dist, ver, paths[dist] | "sort > cpan.dists"
@@ -58,3 +60,10 @@ function decver (vs)
 }
 
 '
+
+if [ $? -ne 0 ]; then
+    echo "fetchcpan: failed to download package list from CPAN" 1>&2
+    exit 1
+fi
+
+exit 0