[Libreoffice-commits] .: solenv/inc

Caolán McNamara caolan at kemper.freedesktop.org
Thu Dec 16 02:00:21 PST 2010


 solenv/inc/tg_ext.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eef9a0e05a1a3da99024925038196c13ae9f8f87
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 09:51:40 2010 +0000

    survive failed chmod for filesystems where its unsupported

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index d05e71d..6942cd7 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -169,8 +169,8 @@ $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE
     @$(TOUCH) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists # $(IFEXIST) only works with files
     $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
-    @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
-    @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
+    @-cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
+    @-cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
 
 #add new files to patch
 $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")


More information about the Libreoffice-commits mailing list