util-vserver-rpm5.patch

   1 --- util-vserver-0.30.216-pre3034/scripts/vrpm.orig     2012-04-24 11:48:10.000000000 +0200
   2 +++ util-vserver-0.30.216-pre3034/scripts/vrpm  2012-10-12 18:44:57.137928223 +0200
   3 @@ -46,6 +46,9 @@
   4      exit 0
   5      }
   6
   7 +rpmversion=$(awk '/^%_rpmversion/ { split($2,ver,/\./); print ver[1] }' /usr/lib/rpm/macros 2>/dev/null)
   8 +[ -z "$rpmversion" ] && rpmversion=5
   9 +
  10  tmp=$(getopt -o +q --long help,version,debug,quiet,$VS_ALLVSERVERS_ARGS -n "$0" -- "$@") || exit 1
  11  eval set -- "$tmp"
  12
  13 @@ -70,4 +73,14 @@
  14  export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT
  15
  16  test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
  17 +if [ "$rpmversion" -ge 5 ]; then
  18 +    declare -a rpm_opts
  19 +    [ ${#vsomething_opts[@]} -eq 0 ] && rpm_opts=( "$1" "--" )
  20 +    if [[ "$@" = *--initdb* ]]; then
  21 +       exec $_VSOMETHING "${send_through[@]}" rpm "${vsomething_opts[@]}" "${rpm_opts[@]}" -qa
  22 +    fi
  23 +    if [[ "$@" = *--convertdb* ]]; then
  24 +       exec $_VSOMETHING "${send_through[@]}" /usr/lib/rpm/bin/dbconvert "${vsomething_opts[@]}" "${rpm_opts[@]}" --rebuilddb
  25 +    fi
  26 +fi
  27  exec $_VSOMETHING "${send_through[@]}" rpm "${vsomething_opts[@]}" "$@"