cleanup

[build.git] / build.common

diff --git a/build.common b/build.common
index e2ddfc8..bb0e479 100644 (file)
--- a/build.common
+++ b/build.common
@@ -320,8 +320,6 @@ EOF
     mkdir -p $vroot/var/lib/rpm
     rpm --root $vroot --initdb
     rpm --root $vroot --import $public_gpg_key
-    echo "DEBUG"
-    echo "rpm --root $vroot --import $public_gpg_key"
 
     # Initialize yum in reference image
     mkdir -p $vroot/var/cache/yum $vroot/var/log
@@ -552,6 +550,7 @@ function pl_parsePkgs () {
     fcdistro=$1; shift
     pldistro=$1; shift
 
+    echo 1>&2 "pl_parsePkgs: using -a $target_arch -f $fcdistro -d $pldistro $keyword $@"
     pkgs.py -a $target_arch -f $fcdistro -d $pldistro $keyword "$@" 
 }
 # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]
@@ -749,15 +748,13 @@ $kexclude_line" $template > $dest_yumconf
     return 0
 }
 
-# from a yum.conf as generated above, computes the (first) gpgkey url
+# from a yum.conf as generated above, computes the gpgkey urls
 function yumconf_gpgkey () {
     dest_yumconf=$1; shift
 
-    first_line=$(grep '^gpgkey=' $dest_yumconf | head -1)
-    values=$(echo $first_line | sed -e s,gpgkey=,,)
-    value=$(echo $values | sed -e 's,$basearch,'"$pl_DISTRO_ARCH",g)
-    [ -n "$value" ] || return 1
-    echo $value
+    values=$(grep -h '^gpgkey=' $dest_yumconf | sed -e s,gpgkey=,, | sed -e 's,$basearch,'"$pl_DISTRO_ARCH",g | sed -e 's, ,\n,g' | sort | uniq | xargs)
+    [ -n "$values" ] || return 1
+    echo $values
     return 0
 }