summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2011-01-21 14:22:04 -0800
committerJesse Keating <jkeating@redhat.com>2011-01-21 14:22:04 -0800
commite50d2677e6d9ab661b791097dde3086ecf21c16f (patch)
tree69940251754daafcc40a7443a7761849c5777117
parent4659f541493f1d4275868856dc198fedf5f296e5 (diff)
downloadfedora-packager-e50d2677e6d9ab661b791097dde3086ecf21c16f.tar.gz
fedora-packager-e50d2677e6d9ab661b791097dde3086ecf21c16f.tar.xz
fedora-packager-e50d2677e6d9ab661b791097dde3086ecf21c16f.zip
Make sure we have an srpm when doing a mockbuild (#665555)
This required a new option to mockbuild, md5. This is because srpm needs this argument to function correctly.
-rw-r--r--src/fedpkg.bash3
-rwxr-xr-xsrc/fedpkg.py4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/fedpkg.bash b/src/fedpkg.bash
index 117bd23..236cfb9 100644
--- a/src/fedpkg.bash
+++ b/src/fedpkg.bash
@@ -140,6 +140,9 @@ _fedpkg()
options="--md5"
options_arch="--arch"
;;
+ mockbuild)
+ options="--md5"
+ ;;
patch)
options="--rediff"
options_string="--suffix"
diff --git a/src/fedpkg.py b/src/fedpkg.py
index 89e3ce5..4c73351 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -579,6 +579,7 @@ def mockbuild(args):
# Pick up any mockargs from the env
mockargs = []
try:
+ srpm(args)
mockargs = os.environ['MOCKARGS'].split()
except KeyError:
# there were no args
@@ -1066,6 +1067,9 @@ packages will be built sequentially.
# Build in mock
parser_mockbuild = subparsers.add_parser('mockbuild',
help = 'Local test build using mock')
+ # optionally define old style hashsums
+ parser_mockbuild.add_argument('--md5', action = 'store_true',
+ help = 'Use md5 checksums (for older rpm hosts)')
parser_mockbuild.set_defaults(command = mockbuild)
# See what's different