changed more uses of .rootdir to makeChrootPath(); updated man page for --copyin and --copyout; updated plugins to use makeChrootPath(); updated releasetests.sh so that daemon tests uses --copyin

2 files changed, 33 insertions, 17 deletions

diff --git a/docs/mock.1 b/docs/mock.1
index ac295e6..4afde95 100644
--- a/docs/mock.1
+++ b/docs/mock.1
@@ -17,6 +17,10 @@ mock  [options] \fB\-\-install\fR PACKAGE
 mock  [options] \fB\-\-update\fR
 .LP
 mock  [options] \fB\-\-orphanskill\fR
+.LP
+mock  [options] \fB\-\-copyin\fR \fIpath [\fIpath...\fR] \fIdestination\fR
+.LP
+mock  [options] \fB\-\-copyout\fR \fIpath [\fIpath...\fR] \fIdestination\fR
 
 .SH "DESCRIPTION"
 .LP
@@ -97,24 +101,41 @@ Show version number and exit.
 .SH "COMMANDS"
 .LP
 .TP
-\fB\-\-clean\fR \- purge the chroot tree
+\fB\-\-clean\fP
+Purge the chroot tree
 .TP
-\fB\-\-init\fR \- initialize a chroot (clean, install chroot packages, etc.)
+\fB\-\-init\fP
+Initialize a chroot (clean, install chroot packages, etc.)
 .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.
+\fB\-\-rebuild\fP
+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\-\-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.
+\fB\-\-shell\fP
+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.
+\fB\-\-chroot\fP 
+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
+\fB\-\-installdeps\fP 
+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
-\fB\-\-install\fR \- Do a yum install PACKAGE inside the buildroot. Buildroot must already be initialized -- no 'clean' is performed
+\fB\-\-install\fP
+Do a yum install PACKAGE inside the buildroot. Buildroot must already be initialized -- no 'clean' is performed
 .TP
-\fB\-\-update\fR \- Do a yum update inside the buildroot. Buildroot must already be initialized -- no 'clean' is performed
+\fB\-\-update\fP 
+Do a yum update inside the buildroot. Buildroot must already be initialized -- no 'clean' is performed
 .TP
 \fB\-\-orphanskill\fP
 Noop mode that simply checks that no stray processes are running in the chroot. Kills any processes that it finds using specified root.
+.TP
+\fB\-\-copyin\fP
+Copies the source paths (files or directory trees) into the chroot at
+the specified destination path. 
+.TP
+\fB\-\-copyout\fP
+Copies the source paths (files or directory trees) from the chroot to
+the specified destination path. 
+
 .SH "FILES"
 .LP
 \fI/etc/mock/\fP \- default configuration directory
diff --git a/docs/releasetests.sh b/docs/releasetests.sh
index 5fb6537..55ed545 100755
--- a/docs/releasetests.sh
+++ b/docs/releasetests.sh
@@ -53,13 +53,6 @@ if [ ! -e $CHROOT/usr/include/python* ]; then
     exit 1
 fi
 
-# test the copyin command
-time $MOCKCMD --copyin docs/release-instructions.txt /tmp
-if [ ! -f $CHROOT/tmp/release-instructions.txt ]; then
-    echo "copyin test FAILED! could not find $CHROOT/tmp/release-instructions.txt"
-    exit 1
-fi
-
 # test the copyout command
 time $MOCKCMD --copyout /etc/passwd /tmp/my-copyout-passwd
 if [ ! -f /tmp/my-copyout-passwd ]; then
@@ -122,13 +115,14 @@ fi
 
 #
 # Test orphanskill feature (std)
+# (also tests the --copyin feature)
 #
 if pgrep daemontest; then
     echo "Exiting because there is already a daemontest running."
     exit 1
 fi
 time $MOCKCMD --offline --init
-cp docs/daemontest $CHROOT/tmp
+time $MOCKCMD --copyin docs/daemontest /tmp
 time $MOCKCMD --offline --chroot -- /tmp/daemontest
 if pgrep daemontest; then
     echo "Daemontest FAILED. found a daemontest process running after exit." 
@@ -137,9 +131,10 @@ fi
 
 #
 # Test orphanskill feature (explicit)
+# (also tests --copyin)
 #
 time $MOCKCMD --offline --init
-cp docs/daemontest $CHROOT/tmp
+time $MOCKCMD --copyin docs/daemontest /tmp
 echo -e "#!/bin/sh\n/tmp/daemontest\nsleep 60\n" >> $CHROOT/tmp/try
 # the following should launch about three processes in the chroot: bash, sleep, daemontest
 $MOCKCMD --offline --chroot -- bash /tmp/try &