- on behalf of bogdano@mandriva.com:

  - improved markrelease command line parsing
  - changelogs entries are now groupped by author, and sorted by revision
    number
  - the changelog now is generated using the Cheetah Template Engine, to
    allow quick modifications without spending time reading code and
    introducing new bugs
  - consequently, was added an option "-T <file>" to rpmlog and getsrpm to
    allow choosing the path of the template to be used
  - added options noauth=0, and baseurl=None in order to disable the
    authentication in some url schemes (http:// and //)
  - replaced some "cl" references to "mdv"

1 files changed, 5 insertions, 4 deletions

diff --git a/RepSys/commands/markrelease.py b/RepSys/commands/markrelease.py
index 628e02d..9e52a31 100644
--- a/RepSys/commands/markrelease.py
+++ b/RepSys/commands/markrelease.py
@@ -39,13 +39,14 @@ def version_callback(option, opt, val, parser):
     try:
         opts.version, opts.release = val.split("-", 1)
     except ValueError:
-        raise Error, "wrong version, use something like 1:2.2-1cl"
+        raise Error, "wrong version, use something like 1:2.2-1mdk"
 
 def parse_options():
     parser = OptionParser(help=HELP)
     parser.defaults["version"] = None
     parser.defaults["release"] = None
-    parser.add_option("-v", action="callback", type="string", callback=version_callback)
+    parser.add_option("-v", action="callback", callback=version_callback,
+            nargs=1, type="string", dest="__ignore")
     parser.add_option("-r", dest="revision")
     parser.add_option("-f", dest="filename")
     parser.add_option("-n", dest="appendname", action="store_true")
@@ -58,7 +59,7 @@ def parse_options():
 
     filename = opts.filename
     appendname = opts.appendname
-    del opts.filename, opts.appendname
+    del opts.filename, opts.appendname, opts.__ignore
 
     if filename:
         if not os.path.isfile(filename):
@@ -87,7 +88,7 @@ def parse_options():
         raise Error, "no revision provided"
     elif not opts.version:
         raise Error, "no version provided"
-    get_auth()
+    #get_auth()
     return opts
 
 def main():