summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormebrown <mebrown>2006-06-08 21:28:46 +0000
committermebrown <mebrown>2006-06-08 21:28:46 +0000
commit2070f0d59f7f293a39e881f0c25c64446211bbcb (patch)
treedef3bd0a816bc9855fff5b40fd731d1c38780d48
parentc828ebd9031b242207368977c20fb00a5ab68493 (diff)
downloadmock-2070f0d59f7f293a39e881f0c25c64446211bbcb.tar.gz
mock-2070f0d59f7f293a39e881f0c25c64446211bbcb.tar.xz
mock-2070f0d59f7f293a39e881f0c25c64446211bbcb.zip
Make rm less verbose.
-rw-r--r--mock.py4
-rw-r--r--src/mock-helper.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/mock.py b/mock.py
index 87b41db..451d2f6 100644
--- a/mock.py
+++ b/mock.py
@@ -183,7 +183,7 @@ class Root:
self._umount('dev/pts')
if os.path.exists(self.basedir):
- cmd = '%s -rfv %s' % (self.config['rm'], self.basedir)
+ cmd = '%s -rf %s' % (self.config['rm'], self.basedir)
(retval, output) = self.do(cmd)
if retval != 0:
@@ -688,7 +688,7 @@ class Root:
# purge the builddir, if it exists
bd_out = '%s%s' % (self.rootdir, self.builddir)
if os.path.exists(bd_out):
- cmd = 'rm -rfv %s' % self.builddir
+ cmd = 'rm -rf %s' % self.builddir
self.do_chroot(cmd, fatal=True)
# create dir structure
diff --git a/src/mock-helper.c b/src/mock-helper.c
index 7b0dda7..4b28061 100644
--- a/src/mock-helper.c
+++ b/src/mock-helper.c
@@ -244,15 +244,15 @@ do_mount (int argc, char *argv[])
void
do_rm (int argc, char *argv[])
{
- /* enough arguments ? mock-helper rm -rfv (rootdir), 4 */
+ /* enough arguments ? mock-helper rm -rf (rootdir), 4 */
if (argc < 4)
error ("not enough arguments");
- /* see if we're doing rm -rfv */
- if (strncmp ("-rfv", argv[2], 4) != 0)
+ /* see if we're doing rm -rf */
+ if (strncmp ("-rf", argv[2], 4) != 0)
error ("%s: options not allowed", argv[2]);
- /* see if we're doing -rfv on a dir under rootsdir */
+ /* see if we're doing -rf on a dir under rootsdir */
check_dir_allowed (rootsdir, argv[3]);
/* all checks passed, execute */