Attachment 590865 Details for Bug 798367 – Separate SCM module into its own subpackage

[patch] Separate SCM module into its own subpackage

0001-Separate-SCM-module-into-its-own-subpackage.patch (text/plain), 2.01 KB, created by Marko Myllynen on 2012-06-11 09:07:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marko Myllynen

Created: 2012-06-11 09:07:54 UTC

Size: 2.01 KB

patch

obsolete

>From 8ad601b0fe980e8e7acbc23e15d7bab64ebfc167 Mon Sep 17 00:00:00 2001
>From: Marko Myllynen <myllynen@redhat.com>
>Date: Mon, 11 Jun 2012 11:42:53 +0300
>Subject: [PATCH] Separate SCM module into its own subpackage
>
>And make it depend on all the possibly needed commands.
>---
> mock.spec.in |   13 +++++++++++++
> py/mock.py   |    7 ++++++-
> 2 files changed, 19 insertions(+), 1 deletions(-)
>
>diff --git a/mock.spec.in b/mock.spec.in
>index aec9421..23a06a1 100644
>--- a/mock.spec.in
>+++ b/mock.spec.in
>@@ -30,6 +30,14 @@ Requires: python-hashlib
> %description
> Mock takes an SRPM and builds it in a chroot
> 
>+%package scm
>+Group: Development/Tools
>+Summary: Mock SCM integration module
>+Requires: mock = %{version}-%{release}, cvs, git, subversion, tar
>+
>+%description scm
>+Mock SCM integration module
>+
> %prep
> %setup -q
> 
>@@ -102,6 +110,7 @@ chmod 2775 /var/cache/mock
> 
> # python stuff
> %{python_sitelib}/*
>+%exclude %{python_sitelib}/mockbuild/scm.*
> 
> # config files
> %dir  %{_sysconfdir}/%{name}
>@@ -119,6 +128,10 @@ chmod 2775 /var/cache/mock
> %defattr(0775, root, mock, 02775)
> %dir /var/cache/mock
> %dir /var/lib/mock
>+
>+%files scm
>+%defattr(-, root, root)
>+%{python_sitelib}/mockbuild/scm.py*
>  
> %changelog
> * Thu Mar 29 2012 Clark Williams <williams@redhat.com> - 1.1.22-1
>diff --git a/py/mock.py b/py/mock.py
>index d70d85e..d1e6574 100755
>--- a/py/mock.py
>+++ b/py/mock.py
>@@ -64,7 +64,6 @@ log = logging.getLogger()
> import mockbuild.exception
> from mockbuild.trace_decorator import traceLog, decorate
> import mockbuild.backend
>-import mockbuild.scm
> import mockbuild.uid
> import mockbuild.util
> 
>@@ -437,6 +436,12 @@ def set_config_opts_per_cmdline(config_opts, options, args):
>     config_opts['online'] = options.online
> 
>     if options.scm:
>+        try:
>+            from mockbuild import scm
>+        except Exception as e:
>+            raise mockbuild.exception.BadCmdline(
>+            "Mock SCM module not installed: %s" % e)
>+
>         config_opts['scm'] = options.scm
>         for option in options.scm_opts:
>             try:
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 798367: 590865