[28759] in Source-Commits
scripts commit: chroot-sources: Support chroots named without -sbuild
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sat May 6 18:30:00 2017
Date: Sat, 6 May 2017 18:29:53 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201705062229.v46MTrxJ020525@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/scripts/commit/346183b8d0f2bbf656fc95d82a229a9db791f413
commit 346183b8d0f2bbf656fc95d82a229a9db791f413
Author: Anders Kaseorg <andersk@mit.edu>
Date: Sat May 6 18:29:05 2017 -0400
chroot-sources: Support chroots named without -sbuild
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
chroot-sources | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/chroot-sources b/chroot-sources
index 1160181..ec2ec85 100755
--- a/chroot-sources
+++ b/chroot-sources
@@ -25,7 +25,7 @@ if [ -z "$DEBATHENA_BUILD_DIST" ]; then
fi
fi
if [ -z "$DEBATHENA_BUILD_DIST" ] && echo "$SCHROOT_CHROOT_NAME" | \
- egrep -q "^[a-z]+-(amd64|i386)-sbuild$"; then
+ egrep -q "^[a-z]+-(amd64|i386)(-sbuild)?$"; then
echo "Attempting to guess dist from chroot name..." >&2
DEBATHENA_BUILD_DIST=$(echo "$SCHROOT_CHROOT_NAME" | cut -d\- -f 1)
fi
