summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2007-12-04 05:28:13 -0500
committerMichael E Brown <michael_e_brown@dell.com>2007-12-04 17:28:01 -0600
commit2679d3cae92a1178b586fc1c07b1fbfcac88972a (patch)
tree5a7daf6bd8c4968060646d934c35c194f614d546
parent3364f97752b54f0f507475934fe486a7c8c79a1d (diff)
downloadmock-2679d3cae92a1178b586fc1c07b1fbfcac88972a.tar.gz
mock-2679d3cae92a1178b586fc1c07b1fbfcac88972a.tar.xz
mock-2679d3cae92a1178b586fc1c07b1fbfcac88972a.zip
use 'MACRO EXPR' in --define docs to match the rpmbuild docs
Signed-off-by: Michael E Brown <michael_e_brown@dell.com>
-rw-r--r--docs/mock.14
-rwxr-xr-xpy/mock.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/mock.1 b/docs/mock.1
index ca212b5..17b5081 100644
--- a/docs/mock.1
+++ b/docs/mock.1
@@ -56,10 +56,10 @@ Dont clean chroot after building. If automatic cleanup is enabled, use this to d
\fB\-\-arch=\fR\fIARCH\fP
Specify target build arch.
.TP
-\fB\-\-define=\fR"\fINAME VALUE\fP"
+\fB\-\-define=\fR"\fIMACRO EXPR\fP"
Specify macro definitions used for the build. This option may be used multiple times, just as the rpmbuild \-\-define option can be. For example:
-\fB\-\-define="vendor Not Fedora" \-\-define="packager Some guy"\fR
+\fB\-\-define="with_extra_cheese 1" \-\-define="packager Monkey"\fR
.TP
\fB\-\-resultdir=\fR\fIRESULTDIR\fP
Change directory where resulting files (RPMs and build logs) are written. Resultdir can contain python-string substitutions for any variable in the chroot config. For example:
diff --git a/py/mock.py b/py/mock.py
index 8f085b2..f626bca 100755
--- a/py/mock.py
+++ b/py/mock.py
@@ -104,7 +104,7 @@ def command_parse(config_opts):
parser.add_option("--arch", action ="store", dest="arch",
default=None, help="target build arch")
parser.add_option("--define", action="append", dest="rpmmacros",
- default=[], type="string", metavar="'NAME VALUE'",
+ default=[], type="string", metavar="'MACRO EXPR'",
help="define an rpm macro (may be used more than once)")
parser.add_option("--resultdir", action="store", type="string",
default=None, help="path for resulting files to be put")
@@ -232,7 +232,7 @@ def set_config_opts_per_cmdline(config_opts, options, args):
config_opts['macros'].update({k: v})
except:
raise mock.exception.BadCmdline(
- "Bad option for '--define' (%s). Use --define 'name value'"
+ "Bad option for '--define' (%s). Use --define 'macro expr'"
% macro)
if options.resultdir: