aboutsummaryrefslogtreecommitdiffstats
path: root/MgaRepo/commands
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-01-28 18:27:48 +0000
committerNicolas Vigier <boklm@mageia.org>2011-01-28 18:27:48 +0000
commit59341cd17766e9aae61256160009184dc469eec3 (patch)
treee996eee5ee1e8cc7805299cb1bb82bc8d3a3befa /MgaRepo/commands
parent98ac9bd43092fbffdbf6e031c18d7a87e0f6131e (diff)
downloadmgarepo-59341cd17766e9aae61256160009184dc469eec3.tar
mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar.gz
mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar.bz2
mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar.xz
mgarepo-59341cd17766e9aae61256160009184dc469eec3.zip
add binrepo revision options
Diffstat (limited to 'MgaRepo/commands')
-rw-r--r--MgaRepo/commands/co.py2
-rw-r--r--MgaRepo/commands/getsrpm.py4
-rw-r--r--MgaRepo/commands/markrelease.py3
3 files changed, 8 insertions, 1 deletions
diff --git a/MgaRepo/commands/co.py b/MgaRepo/commands/co.py
index e7c9aec..8044c86 100644
--- a/MgaRepo/commands/co.py
+++ b/MgaRepo/commands/co.py
@@ -19,6 +19,7 @@ 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
@@ -37,6 +38,7 @@ 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,
diff --git a/MgaRepo/commands/getsrpm.py b/MgaRepo/commands/getsrpm.py
index 6c238ba..0642c85 100644
--- a/MgaRepo/commands/getsrpm.py
+++ b/MgaRepo/commands/getsrpm.py
@@ -24,6 +24,7 @@ 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
@@ -41,7 +42,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 file:///svn/cnc/snapshot/python
+ mgarepo getsrpm -r 1001 -R 101 file:///svn/cnc/snapshot/python
"""
def mode_callback(option, opt, val, parser, mode):
@@ -78,6 +79,7 @@ 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,
diff --git a/MgaRepo/commands/markrelease.py b/MgaRepo/commands/markrelease.py
index 857d38d..65a091c 100644
--- a/MgaRepo/commands/markrelease.py
+++ b/MgaRepo/commands/markrelease.py
@@ -30,6 +30,7 @@ structure.
Options:
-f FILE Try to extract information from given file
-r REV Revision which will be used to make the release copy tag
+ -R REV binrepo revision which will be used to make the release copy tag
-v VER Version which will be used to make the release copy tag
-n Append package name to provided URL
-h Show this message
@@ -51,9 +52,11 @@ def parse_options():
parser = OptionParser(help=HELP)
parser.defaults["version"] = None
parser.defaults["release"] = None
+ parser.defaults["binrev"] = None
parser.add_option("-v", action="callback", callback=version_callback,
nargs=1, type="string", dest="__ignore")
parser.add_option("-r", dest="revision")
+ parser.add_option("-R", dest="binrev")
parser.add_option("-f", dest="filename")
parser.add_option("-n", dest="appendname", action="store_true")
opts, args = parser.parse_args()