diff options
author | Florian Festi <ffesti@redhat.com> | 2023-05-17 17:23:59 +0200 |
---|---|---|
committer | Michal Domonkos <mdomonko@redhat.com> | 2023-05-17 17:40:11 +0200 |
commit | 021a7d3aaa5458d8956babf0220a3e574a2b8e62 (patch) | |
tree | b78c0bbcc9a98364a351e057c66f5b52d073d7cf | |
parent | 2df8008d22b58f87fe665de0fa8c5bbeb4b4a3d8 (diff) | |
download | rpm-master.tar.gz |
to not error out when invoking %setup more than once or shipping the
directory in the sources.
-rw-r--r-- | build/parsePrep.c | 2 | ||||
-rw-r--r-- | tests/rpmspec.at | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/parsePrep.c b/build/parsePrep.c index f8e09a8c7..ea8faa953 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -274,7 +274,7 @@ static int doSetupMacro(rpmSpec spec, const char *line) } /* mkdir for dynamic specparts */ - buf = rpmExpand("%{__mkdir} SPECPARTS", NULL); + buf = rpmExpand("%{__mkdir_p} SPECPARTS", NULL); appendBuf(spec, buf, 1); free(buf); diff --git a/tests/rpmspec.at b/tests/rpmspec.at index 548b4b3cc..564479391 100644 --- a/tests/rpmspec.at +++ b/tests/rpmspec.at @@ -333,7 +333,7 @@ if [ $STATUS -ne 0 ]; then exit $STATUS fi cd 'hello-1.0' -/usr/bin/mkdir SPECPARTS +/usr/bin/mkdir -p SPECPARTS /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . echo "Patch #0 (hello-1.0-modernize.patch):" /usr/bin/patch --no-backup-if-mismatch -f -p1 -b --suffix .modernize --fuzz=0 < /build/SOURCES/hello-1.0-modernize.patch |