From e458930e64f2ab297da5d2b4bf778d274df04487 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 17 Aug 2011 20:49:53 +0000
Subject: remove old options

---
 MgaRepo/commands/co.py      | 11 -----------
 MgaRepo/commands/getsrpm.py | 10 +---------
 MgaRepo/rpmutil.py          |  9 +++------
 create-srpm                 |  2 --
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/MgaRepo/commands/co.py b/MgaRepo/commands/co.py
index 6c8f0c7..0a111e2 100644
--- a/MgaRepo/commands/co.py
+++ b/MgaRepo/commands/co.py
@@ -19,12 +19,8 @@ Options:
     -d      The distribution branch to checkout from
     -b      The package branch
     -r REV  Revision to checkout
-    -R REV  binrepo revision to checkout
-    -S      Do not download sources from the binaries repository
-    -L      Do not make symlinks of the binaries downloaded in SOURCES/
     -s      Only checkout the SPECS/ directory
     -M      Do not use the mirror (use the main repository)
-    --check Check integrity of files fetched from the binary repository
     -h      Show this message
 
 Examples:
@@ -38,13 +34,6 @@ Examples:
 def parse_options():
     parser = OptionParser(help=HELP)
     parser.add_option("-r", dest="revision")
-    parser.add_option("-R", dest="binrev")
-    parser.add_option("-S", dest="use_binrepo", default=True,
-            action="store_false")
-    parser.add_option("--check", dest="binrepo_check", default=False,
-            action="store_true")
-    parser.add_option("-L", dest="binrepo_link", default=True,
-            action="store_false")
     parser.add_option("--distribution", "-d", dest="distro", default=None)
     parser.add_option("--branch", "-b", dest="branch", default=None)
     parser.add_option("-s", "--spec", dest="spec", default=False,
diff --git a/MgaRepo/commands/getsrpm.py b/MgaRepo/commands/getsrpm.py
index 0642c85..1d437d4 100644
--- a/MgaRepo/commands/getsrpm.py
+++ b/MgaRepo/commands/getsrpm.py
@@ -24,7 +24,6 @@ Options:
     -p         Use files in pristine/ directory
     -v VER     Use files from the version specified by VER (e.g. 2.2.1-2cl)
     -r REV     Use files from current directory, in revision REV (e.g. 1001)
-    -R REV     Use binrepo files from current directory, in revision REV (e.g. 1001)
     -t DIR     Put SRPM file in directory DIR when done (default is ".")
     -P USER    Define the RPM packager inforamtion to USER
     -s FILE    Run script with "FILE TOPDIR SPECFILE" command
@@ -33,8 +32,6 @@ Options:
     -T FILE    Template to be used to generate the %changelog
     -M         Do not use the mirror (use the main repository)
     -h         Show this message
-    -S         Do not download sources from the binary repository
-    --check    Check integrity of files fetched from the binary repository
     --strict   Check if the given revision contains changes in REPPKGURL
 
 Examples:
@@ -42,7 +39,7 @@ Examples:
     mgarepo getsrpm -l python
     mgarepo getsrpm http://foo.bar/svn/cnc/snapshot/python
     mgarepo getsrpm -p http://foo.bar/svn/cnc/releases/8cl/python
-    mgarepo getsrpm -r 1001 -R 101 file:///svn/cnc/snapshot/python
+    mgarepo getsrpm -r 1001 file:///svn/cnc/snapshot/python
 """
 
 def mode_callback(option, opt, val, parser, mode):
@@ -79,11 +76,6 @@ def parse_options():
     parser.add_option("-n", dest="revname", action="store_true")
     parser.add_option("-l", dest="svnlog", action="store_true")
     parser.add_option("-T", dest="template", type="string", default=None)
-    parser.add_option("-R", dest="binrev", type="string", default=None)
-    parser.add_option("-S", dest="use_binrepo", default=True,
-            action="store_false")
-    parser.add_option("--check", dest="binrepo_check", default=False,
-            action="store_true")
     parser.add_option("-M", "--no-mirror", action="callback",
             callback=disable_mirror)
     parser.add_option("--strict", dest="strict", default=False,
diff --git a/MgaRepo/rpmutil.py b/MgaRepo/rpmutil.py
index a05511a..3a9ee83 100644
--- a/MgaRepo/rpmutil.py
+++ b/MgaRepo/rpmutil.py
@@ -61,7 +61,6 @@ def get_srpm(pkgdirurl,
              version = None,
              release = None,
              revision = None,
-             binrev = None,
              packager = "",
              revname = 0,
              svnlog = 0,
@@ -70,9 +69,7 @@ def get_srpm(pkgdirurl,
              template = None,
              macros = [],
              verbose = 0,
-             strict = False,
-             use_binrepo = False,
-             binrepo_check = True):
+             strict = False):
     svn = SVN()
     tmpdir = tempfile.mktemp()
     topdir = "--define '_topdir %s'" % tmpdir
@@ -460,8 +457,8 @@ def check_changed(pkgdirurl, all=0, show=0, verbose=0):
             "nocurrent": nocurrent,
             "nopristine": nopristine}
 
-def checkout(pkgdirurl, path=None, revision=None, binrev=None, branch=None, distro=None,
-        spec=False, use_binrepo=False, binrepo_check=True, binrepo_link=True):
+def checkout(pkgdirurl, path=None, revision=None, branch=None, distro=None,
+        spec=False):
     o_pkgdirurl = pkgdirurl
     pkgdirurl = layout.package_url(o_pkgdirurl, distro=distro)
     append = None
diff --git a/create-srpm b/create-srpm
index 89a8301..75fe594 100755
--- a/create-srpm
+++ b/create-srpm
@@ -56,8 +56,6 @@ class CmdIface:
                          svnlog=1,
                          revname=1,
                          scripts=target.scripts, 
-                         use_binrepo = True,
-                         binrepo_check = True,
                          macros=target.macros)
                 uploadsrpms.extend(targetsrpms)
             uploadcmd = get_helper("upload-srpm")
-- 
cgit v1.2.1