diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2007-12-11 18:09:25 -0600 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2007-12-11 18:09:25 -0600 |
| commit | 7cfb96aebd24dee149e2573eae2c169fe0fc4c27 (patch) | |
| tree | b682716ef86be7753724df47a8b780c3ce29d58c /docs | |
| parent | feaaffe73baa6808eb229041b86cdea6f5c1c56f (diff) | |
| parent | bd5d08919539538c0bfead439fd8e3a33f3b01b3 (diff) | |
| download | mock-7cfb96aebd24dee149e2573eae2c169fe0fc4c27.tar.gz mock-7cfb96aebd24dee149e2573eae2c169fe0fc4c27.tar.xz mock-7cfb96aebd24dee149e2573eae2c169fe0fc4c27.zip | |
Merge branch 'master' of /var/ftp/pub/Applications/git/mock
* 'master' of /var/ftp/pub/Applications/git/mock:
- make "mock --chroot" non-interactive - set the exit code of "mock --chroot" to the exit code of the process run in the chroot - log the output of the process to root.log
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/mock.1 | 4 | ||||
| -rwxr-xr-x | docs/releasetests.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/mock.1 b/docs/mock.1 index 89c443a..624c026 100644 --- a/docs/mock.1 +++ b/docs/mock.1 @@ -101,7 +101,9 @@ Show version number and exit. .TP \fB\-\-rebuild\fR \- If no command is specified, rebuild is assumed. Rebuilds the specified SRPM(s). The buildroot is cleaned first, unless --no-clean is specified. .TP -\fB\-\-chroot\fR|\fB\-\-shell\fR \- run the specified command within the chroot (which must already be initialized -- no 'clean' is performed). If no command specified, /bin/sh is run. +\fB\-\-shell\fR \- run the specified command interactively within the chroot (which must already be initialized -- no 'clean' is performed). If no command specified, /bin/sh is run. +.TP +\fB\-\-chroot\fR \- run the specified command non-interactively within the chroot (which must already be initialized -- no 'clean' is performed). Command output will be sent to the log files. .TP \fB\-\-installdeps\fR \- find out deps for SRPM or RPM, and do a yum install to put them in the buildroot. Buildroot must already be initialized -- no 'clean' is performed .TP diff --git a/docs/releasetests.sh b/docs/releasetests.sh index ca5c0f7..2a98e1d 100755 --- a/docs/releasetests.sh +++ b/docs/releasetests.sh @@ -56,7 +56,7 @@ fi # Test that chroot return code is properly passed up # set +e -time $MOCKCMD --offline --chroot 'bash -c "exit 5"' +time $MOCKCMD --offline --chroot -- bash -c "exit 5" if [ $? -ne 5 ]; then echo "'mock --chroot' return code not properly passed back." exit 1 |