summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-07-27 15:58:10 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-07-27 15:58:10 -0400
commit5962de4f1c8dca824cde5f823f16b59ee2facc93 (patch)
treeec7759394703303534cfc92288e5ac8711e8b64b /src
parentccc84f329bd5c98b25a85422a0cf4e9b18324082 (diff)
librestage: be more careful about the xbs configuration
Diffstat (limited to 'src')
-rwxr-xr-xsrc/abslibre-tools/librestage7
1 files changed, 4 insertions, 3 deletions
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"