[PATCH libreoffice-4-0] fix race condition when using hardlinks to deliver into solv...

[Petr Mladek (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2840

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/2840/1

fix race condition when using hardlinks to deliver into solver

We need to use "touch --no-dereference" on the delivered files.
Otherwise, it creates empty target file when you touch symlinks and
delivering the real target file might fail.

This caused many build failures when delivering:

    liblcms2.so -> liblcms2.so.2.0.4
    liblcms2.so.2 -> liblcms2.so.2.0.4
    liblcms2.so.2.0.4

Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935
---
M solenv/gbuild/Deliver.mk
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 0f257e5..ab56dab 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -60,7 +60,7 @@
 endef
 
 define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
 endef
 
 ifneq ($(strip $(gb_Deliver_GNUCOPY)),)

-- 
To view, visit https://gerrit.libreoffice.org/2840
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Petr Mladek <pmladek at suse.cz>