summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2010-03-11 13:57:22 -0800
committerJesse Keating <jkeating@redhat.com>2010-03-11 13:57:22 -0800
commitbc678aba383d1a6ad4ffd884ca21aa4058856e86 (patch)
tree4df2403c1cd2a274891e00f0a6b72c81a2816f32
parenta087ff5ed320edd44f8c1d6cf3f56f7cd942e3ac (diff)
downloadmock-bc678aba383d1a6ad4ffd884ca21aa4058856e86.tar.gz
mock-bc678aba383d1a6ad4ffd884ca21aa4058856e86.tar.xz
mock-bc678aba383d1a6ad4ffd884ca21aa4058856e86.zip
Revert "add configuration option to run createrepo on result rpms"
This reverts commit 716d41a0090047c3e943d102537b87d86fdcbe88. We've decided to revert this feature on the 1.0.x series. We'll add it back for 1.1
-rw-r--r--etc/mock/site-defaults.cfg4
-rw-r--r--mock.spec.in1
-rwxr-xr-xpy/mock.py7
3 files changed, 0 insertions, 12 deletions
diff --git a/etc/mock/site-defaults.cfg b/etc/mock/site-defaults.cfg
index 6da9290..0ee2082 100644
--- a/etc/mock/site-defaults.cfg
+++ b/etc/mock/site-defaults.cfg
@@ -45,10 +45,6 @@
# config_opts['cleanup_on_success'] = 1
# config_opts['cleanup_on_failure'] = 1
-# if you want mock to automatically run createrepo on the rpms in your
-# resultdir.
-# config_opts['createrepo_on_rpms'] = True
-
#############################################################################
#
# plugin related. Below are the defaults. Change to suit your site
diff --git a/mock.spec.in b/mock.spec.in
index 8bd8cc2..2addc04 100644
--- a/mock.spec.in
+++ b/mock.spec.in
@@ -19,7 +19,6 @@ URL: http://fedoraproject.org/wiki/Projects/Mock
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
-Requires: createrepo
Requires(pre): shadow-utils
BuildRequires: python-devel
%if "%{?dist}" == ".el5"
diff --git a/py/mock.py b/py/mock.py
index eea493c..f4794ac 100755
--- a/py/mock.py
+++ b/py/mock.py
@@ -227,7 +227,6 @@ def setup_default_config_opts(config_opts, unprivUid):
config_opts['cleanup_on_success'] = 1
config_opts['cleanup_on_failure'] = 1
- config_opts['createrepo_on_rpms'] = True
# (global) plugins and plugin configs.
# ordering constraings: tmpfs must be first.
# root_cache next.
@@ -379,12 +378,6 @@ def do_rebuild(config_opts, chroot, srpms):
if config_opts["cleanup_on_success"]:
log.info("Cleaning up build root ('clean_on_success=True')")
chroot.clean()
-
- if config_opts["createrepo_on_rpms"]:
- log.info("Running createrepo on binary rpms in resultdir")
- cmd = ['/usr/bin/createrepo', '-d', '-q', '-x', '*.src.rpm', chroot.resultdir]
- mock.util.do(cmd)
-
except (Exception, KeyboardInterrupt):
elapsed = time.time() - start
log.error("Exception(%s) Config(%s) %d minutes %d seconds"