From 199d1d4b2e108de3c472ae44521ead4143e1083b Mon Sep 17 00:00:00 2001
From: Sebastian Knapp <rock@ccls-online.de>
Date: Wed, 16 Mar 2005 13:39:22 +0000
Subject: [PATCH] giftnuss:     change Download for import packages    
 ./scripts/Download cpan         - download all cpan packages    
 ./scripts/Download cpan-yaml         - download cpan-yaml

[2004122800070529346] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5684 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/import/cpan/pkgmapper.in     |  1 +
 package/import/freedict/pkgmapper.in |  1 +
 scripts/Download                     | 10 ++++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/package/import/cpan/pkgmapper.in b/package/import/cpan/pkgmapper.in
index 40d34b3e1..3e50f0e2d 100644
--- a/package/import/cpan/pkgmapper.in
+++ b/package/import/cpan/pkgmapper.in
@@ -1,5 +1,6 @@
 
 if [ -z "${pkg##cpan-*}" ]; then
+        ignore_xpkg=0
         pkg=cpan
 fi
 
diff --git a/package/import/freedict/pkgmapper.in b/package/import/freedict/pkgmapper.in
index 645458c4b..f0cbbd4d2 100644
--- a/package/import/freedict/pkgmapper.in
+++ b/package/import/freedict/pkgmapper.in
@@ -1,5 +1,6 @@
 
 if [ -z "${pkg##freedict-*}" ]; then
+        ignore_xpkg=0
         pkg=freedict
 fi
 
diff --git a/scripts/Download b/scripts/Download
index 6fbf2096f..28a50aa70 100755
--- a/scripts/Download
+++ b/scripts/Download
@@ -236,11 +236,17 @@ curl_options="$curl_options -k"
 
 # build descparser if needed and run it
 descparser() {
+        local var
 	if [ ! -f src/descparser ]; then
 		mkdir -p src
 		cc -o src/descparser misc/tools-source/descparser.c
 	fi
-	cat "$@" | descparser_ign_xpkg=1 src/descparser
+        if [ "$ignore_xpkg" == "0" ]; then
+             var=""
+        else
+             var="descparser_ign_xpkg=1"
+        fi
+	cat "$@" | eval $var src/descparser
 }
 
 # cksum_chk filename cksum origfile
@@ -907,7 +913,7 @@ mapped_packages() {
 			-printf '%f\t%p\n' | sort | awk '{ $1="."; print; }' > src/pkgmapper
 	fi
 	for pkg; do
-		xpkg=$pkg
+		export xpkg=$pkg
 		. src/pkgmapper
 		packages $pkg
 	done