[git-buildpackage] [PATCH 2/3] buildpackage-rpm: remove --git-mock-options

[tzafrir at debian.org]

From: Tzafrir Cohen <tzafrir at debian.org>

--git-mock-options wasn't implemented. Furthermore, it could probably
not be implemented properly to pass options that contain spaces.

Let's just stick to passing options in the command-line.
---
 docs/manpages/gbp-buildpackage-rpm.sgml | 12 ------------
 gbp/scripts/buildpackage_rpm.py         |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/docs/manpages/gbp-buildpackage-rpm.sgml b/docs/manpages/gbp-buildpackage-rpm.sgml
index d5aa8f7..fc512a7 100644
--- a/docs/manpages/gbp-buildpackage-rpm.sgml
+++ b/docs/manpages/gbp-buildpackage-rpm.sgml
@@ -61,8 +61,6 @@
       <arg><option>--git-mock</option></arg>
       <arg><option>--git-dist</option>=<replaceable>DISTRIBUTION</replaceable></arg>
       <arg><option>--git-arch</option>=<replaceable>ARCHITECTURE</replaceable></arg>
-      <arg><option>--git-mock-options</option>=<replaceable>OPTIONS</replaceable></arg>
-      <arg><option>--git-mock-root</option>=<replaceable>ROOT</replaceable></arg>
       <arg rep="repeat"><option>OPTION_PASSED_TO_BUILD_CMD</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -601,16 +599,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--git-mock-options</option>
-        </term>
-        <listitem>
-          <para>
-	    Additional options to pass to mock. Default is to pass no
-	    additional options.
-          </para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index d8c6da7..7cd39e6 100644
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -290,8 +290,6 @@ def setup_mock(options):
         if options.mock_root:
             os.environ['GBP_BUILDER_MOCK_ROOT'] = options.mock_root
         os.environ['GBP_BUILDER_MOCK_EXPORT_DIR'] = options.export_dir
-        if options.mock_options:
-            os.environ['GBP_BUILDER_MOCK_OPTIONS'] = options.mock_options
 
 
 def create_packaging_tag(repo, commit, name, version, options):
@@ -420,7 +418,6 @@ def build_parser(name, prefix=None, git_treeish=None):
     cmd_group.add_config_file_option(option_name="dist", dest="mock_dist")
     cmd_group.add_config_file_option(option_name="arch", dest="mock_arch")
     cmd_group.add_config_file_option(option_name="mock-root", dest="mock_root")
-    cmd_group.add_config_file_option(option_name="mock-options", dest="mock_options")
     cmd_group.add_boolean_config_file_option(option_name="hooks", dest="hooks")
     export_group.add_option("--git-no-build", action="store_true",
                     dest="no_build",
-- 
2.8.1