[Xen-devel] [PATCH] pygrub: add quoting to install receipe

[Olaf Hering <olaf@xxxxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1343895857 -7200
# Node ID 480b8f03e6635873e32b6fdcb4a8e19b7b8b3a04
# 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>

diff -r 3d622e2c7cfb -r 480b8f03e663 tools/pygrub/Makefile
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel