]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- work around mksh handling && pipes when -e is in effect
authorJan Rękorajski <baggins@pld-linux.org>
Fri, 25 Jan 2013 13:05:53 +0000 (14:05 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Fri, 25 Jan 2013 13:05:53 +0000 (14:05 +0100)
rpm-clean-docdir.patch

index 33af9d6717da2e52098dd78b4c9d0a3a8c6b6355..5b8c8584d34932305ff0c74297f5421940c4112e 100644 (file)
@@ -1,10 +1,10 @@
 --- rpm-5.4.10/build/files.c~  2013-01-24 14:24:39.161982722 +0100
 +++ rpm-5.4.10/build/files.c   2013-01-24 14:27:50.620325354 +0100
-@@ -1048,6 +1048,7 @@
+@@ -1045,6 +1045,7 @@
                pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "DOCDIR=\"$RPM_BUILD_ROOT\"", 0);
                pkg->specialDoc = rpmiobAppend(pkg->specialDoc, buf, 1);
                pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "export DOCDIR", 1);
-+              pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "test -d \"$DOCDIR\" && rmdir \"$DOCDIR\"", 1);
++              pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "if test -d \"$DOCDIR\" ; then rmdir \"$DOCDIR\" ; fi", 1);
                mkdir_p = rpmExpand("%{?__mkdir_p}%{!?__mkdir_p:mkdir -p}", NULL);
                if (!mkdir_p)
                    mkdir_p = xstrdup("mkdir -p");
This page took 0.058353 seconds and 4 git commands to generate.