let newpackage set additional fields

[zpackage] / zpm-contents

diff --git a/zpm-contents b/zpm-contents
index 18fac9443dc45360dbb947f89c7bfcf40042c12f..d466478dd11d2581aee9c86967f4dd4c8e5657b3 100755 (executable)
--- a/zpm-contents
+++ b/zpm-contents
@@ -41,28 +41,28 @@ elif [ $quiet -eq 0 ]; then
 fi
 
 pkglist=
+efail=0
 while [ $# -gt 0 ]; do
        pkg=$1
        shift
-       if [ "$pkg" = '--' ]; then
-               break;
+
+       if [ "$pkg" = ':' ]; then
+               break
        fi
 
        pkgid=$(zpm findpkg -f $pkgfile "$pkg")
        if [ -n "$pkgid" ]; then
-               q=$(zpm quote -q "$pkgid")
-               pkglist=",$q"
+               pkglist="$pkglist $pkgid"
        else
-               printf "package $pkg not found, ignoring\n" 1>&2
-               exit 1
-       fi
-       pkglist=${pkglist#,}
-       if [ -z "$pkglist" ]; then
-               printf "can't find any packages\n" 1>&2
-               exit 1
+               printf "package $pkg not found\n" 1>&2
+               efail=1
        fi
 done
 
+if [ $efail -eq 1 ]; then
+       exit 1;
+fi
+
 globlist=
 for glob in "$@"; do
        q=$(zpm quote -q "$glob")
@@ -102,7 +102,7 @@ cols=${cols%,}
                printf "and (%s)\n" "$globlist"
        fi
        if [ -n "$pkglist" ]; then
-               printf "and pkgid in (%s)\n" "$pkglist"
+               printf "and pkgid in (%s)\n" "$(zpm quote -d, -q $pkglist)"
        fi
        case $config in
                only) printf "and configuration = 1\n" ;;