Re: [Xen-devel] [PATCH] tools/pygrub: do not override pygrub with a symbolic link

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Mon, 2013-04-22 at 12:50 +0100, Christoph Egger wrote:
> tools/pygrub: Do not override pygrub with a symbolic link if $(BINDIR)
> and $(PRIVATE_BINDIR) are the same.

More properly this is "fix the if condition we use to decide when to
create the symlink", since it is already the intention to not override
if they are the same  but the condition is written wrong since it
includes DESTDIR on one side but not the other, which defeats the check.

FWIW I would niuke the DESTDIR on the left rather than adding it on the
right, it might even fit on one line then?

> Signed-off-by: Christoph Egger <chegger@xxxxxxxxx>
> diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
> index 039f7f7..c3b34d7 100644
> --- a/tools/pygrub/Makefile
> +++ b/tools/pygrub/Makefile
> @@ -15,8 +15,8 @@ install: all
>               --install-scripts=$(PRIVATE_BINDIR) --force
>       $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
>       set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
> -                  "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
> -         ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
> +                  "`readlink -f $(DESTDIR)/$(PRIVATE_BINDIR)`" ]; then \
> +         ln -sf $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \

I don't think this change to the first path passed to ln is correct
since this will become the content of the symlink, which doesn't want to
include DESTDIR.

Ian.



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel