|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] pygrub: add quoting to install receipe
# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1343900762 -3600
# Node ID 619c4298f055f4e4b4c82b5d703acaf344f8bc62
# Parent 3d622e2c7cfb15b37498e9bb8f1005516fe99f2f
pygrub: add quoting to install receipe
The changeset 25694:e20085770cb5 causes a syntax error if readline
returns nothing due to non-existant path:
[ 148s] set -e; if [ `readlink -f
/home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin` != \
[ 148s] `readlink -f /usr/lib64/xen/bin` ]; then \
[ 148s] ln -sf /usr/lib64/xen/bin/pygrub
/home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin; \
[ 148s] fi
[ 148s] /bin/sh: line 0: [:
/home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install/usr/bin: unary
operator expected
Add quoting to fix the error.
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
diff -r 3d622e2c7cfb -r 619c4298f055 tools/pygrub/Makefile
--- a/tools/pygrub/Makefile Wed Aug 01 12:46:52 2012 +0100
+++ b/tools/pygrub/Makefile Thu Aug 02 10:46:02 2012 +0100
@@ -14,8 +14,8 @@ install: all
$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
--install-scripts=$(PRIVATE_BINDIR) --force
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
- set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \
- `readlink -f $(PRIVATE_BINDIR)` ]; then \
+ set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
+ "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
fi
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |