From 5962de4f1c8dca824cde5f823f16b59ee2facc93 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Jul 2014 15:58:10 -0400 Subject: librestage: be more careful about the xbs configuration --- src/abslibre-tools/librestage | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/abslibre-tools/librestage') diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 14a040f..39523ac 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -59,14 +59,15 @@ main() { return 1 fi - if ! xbs status; then + if ! xbs -b abslibre status; then error "There are uncommitted changes in the current directory" return 1 fi # Load configuration load_files libretools - check_vars libretools WORKDIR ARCHES || return 1 + # ABSLIBREDEST is used by xbs release-client + check_vars libretools WORKDIR ARCHES ABSLIBREDEST || return 1 load_files makepkg # for PKGDEST and SRCDEST, which are optional load_files librefetch # for MIRRORS, which is optional @@ -93,7 +94,7 @@ main() { die "PACKAGER wes not set when building package" fi - xbs release-client "$repo" "$CARCH" + xbs -b abslibre release-client "$repo" "$CARCH" mkdir -p "${WORKDIR}/staging/${repo}" if cp "$pkgfile" "${WORKDIR}/staging/${repo}/${pkgfile##*/}"; then msg2 "%s staged on [%s]" "$_pkgname" "$repo" -- cgit v1.2.2