[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-1-34-g6e72849
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 26667ab0b8c59e4f8f401cf85d61c3f0281d5f26
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Feb 20 03:23:19 2012 +0100
apply smoketest cleanup fix by Rico Tzschichholz
diff --git a/rules b/rules
index ab80cb7..6c53676 100755
--- a/rules
+++ b/rules
@@ -1630,8 +1630,10 @@ endif
export SAL_USE_VCLPLUGIN="svp"; \
$(MAKE) check gb_FULLDEPS=
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
- cd $(CURDIR)/debian/smoketest && \
- find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;
+ if test -d $(CURDIR)/debian/smoketest; then \
+ cd $(CURDIR)/debian/smoketest && \
+ find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \; ; \
+ fi
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
--
LibreOffice packaging repository
Reply to: