From 565de75a06ac5e4d4e984083d0d1fbcfef4a18ad Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 20 Nov 2017 12:42:26 +0000 Subject: [PATCH] xbps-src: flip logic of -Q --- common/xbps-src/shutils/chroot.sh | 2 +- xbps-src | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index b02b6e3b029..2379f63ee7f 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -198,7 +198,7 @@ chroot_handler() { [ -n "$XBPS_BUILD_FORCEMODE" ] && arg="$arg -f" [ -n "$XBPS_MAKEJOBS" ] && arg="$arg -j$XBPS_MAKEJOBS" [ -n "$XBPS_DEBUG_PKGS" ] && arg="$arg -g" - [ -z "$XBPS_CHECK_PKGS" -o "$XBPS_CHECK_PKGS" = "0" -o "$XBPS_CHECK_PKGS" = "no" ] && arg="$arg -Q" + [ -z "$XBPS_CHECK_PKGS" -o "$XBPS_CHECK_PKGS" = "0" -o "$XBPS_CHECK_PKGS" = "no" ] || arg="$arg -Q" [ -n "$XBPS_BUILD_ONLY_ONE_PKG" -a "$XBPS_BUILD_ONLY_ONE_PKG" != "0" -a "$XBPS_BUILD_ONLY_ONE_PKG" != "no" ] && arg="$arg -1" [ -n "$XBPS_QUIET" ] && arg="$arg -q" [ -n "$XBPS_SKIP_DEPS" ] && arg="$arg -I" diff --git a/xbps-src b/xbps-src index 4f97e30148e..992de6de05a 100755 --- a/xbps-src +++ b/xbps-src @@ -146,6 +146,8 @@ $(print_cross_targets) -G Enable XBPS_USE_GIT_REVS (see etc/defaults.conf for more information). +-Q Enable running the check stage. + -g Enable building -dbg packages with debugging symbols. -H @@ -438,7 +440,7 @@ while getopts "$XBPS_OPTSTRING" opt; do N) readonly XBPS_SKIP_REMOTEREPOS=1; XBPS_OPTIONS+=" -N";; o) readonly XBPS_PKG_OPTIONS="$OPTARG"; XBPS_OPTIONS+=" -o $OPTARG";; q) export XBPS_QUIET=1; XBPS_OPTIONS+=" -q";; - Q) export XBPS_CHECK_PKGS=0; XBPS_OPTIONS+=" -Q";; + Q) export XBPS_CHECK_PKGS=1; XBPS_OPTIONS+=" -Q";; r) readonly XBPS_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";; t) export XBPS_TEMP_MASTERDIR=1; XBPS_OPTIONS+=" -t -C";; V) echo $XBPS_SRC_VERSION && exit 0;;