[Rpm-maint] [rpm-software-management/rpm] Make %{buildsubdir} usable without being a side effect of %setup. (#860)

Adam Jackson notifications at github.com
Tue Sep 24 23:08:42 UTC 2019


nwnk approved this pull request.



> @@ -329,8 +333,8 @@ static int doSetupMacro(rpmSpec spec, const char *line)
 
     /* if necessary, create and cd into the proper dir */
     if (createDir) {
-	buf = rpmExpand("%{__mkdir_p} ", spec->buildSubdir, "\n",
-			"cd '", spec->buildSubdir, "'", NULL);
+	buf = rpmExpand("%{?_buildsubdir:%{__mkdir_p} '%{_buildsubdir}'\n}",
+			"cd '%{_buildsubdir}'}", NULL);

The CI build caught this:

```
/srv/rpm/rpm-4.15.90/_build/sub/tests/testing/tmp/rpm-tmp.5Xq9OQ: line 31: cd: test-1.0}: No such file or directory
```

You have an extra `}` in the `cd` command here.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/860#pullrequestreview-292520184
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rpm.org/pipermail/rpm-maint/attachments/20190924/2888290a/attachment-0001.html>


More information about the Rpm-maint mailing list