/[soft]/mga-gnome/trunk/mga-gnome
ViewVC logotype

Diff of /mga-gnome/trunk/mga-gnome

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3653 by ovitters, Wed Mar 21 19:53:09 2012 UTC revision 3654 by ovitters, Wed Mar 21 21:49:09 2012 UTC
# Line 697  def cmd_package_new_version(options, par Line 697  def cmd_package_new_version(options, par
697                  subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)                  subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)
698                  sys.exit(1)                  sys.exit(1)
699    
700      # We can even checkin and submit :-)      try:
701      if options.submit:          # If we made it this far, checkin the changes
702          try:          subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)
703              # checkin changes  
704              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)          # Submit is optional
705              # and submit          if options.submit:
706              # XXX HACK NOT TO AUTO SUBMIT ATM              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)
707              if options.hexdigest is None:      except subprocess.CalledProcessError:
708                  subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)          sys.exit(1)
         except subprocess.CalledProcessError:  
             sys.exit(1)  
709    
710  def cmd_parse_ftp_release_list(options, parser):  def cmd_parse_ftp_release_list(options, parser):
711      def _send_reply_mail(contents, orig_msg, to, packages=[], error=False):      def _send_reply_mail(contents, orig_msg, to, packages=[], error=False):
# Line 787  def cmd_parse_ftp_release_list(options, Line 785  def cmd_parse_ftp_release_list(options,
785    
786      error = False      error = False
787      for package in packages:      for package in packages:
788          cmd = ['mga-gnome', 'increase', '--submit', '--hash', hexdigest]          cmd = ['mga-gnome', 'increase', '--hash', hexdigest]
789            if options.submit:
790                cmd.append('--submit')
791          if options.force:          if options.force:
792              cmd.append('--force')              cmd.append('--force')
793          cmd.extend((package, version))          cmd.extend((package, version))
# Line 862  def main(): Line 862  def main():
862      subparser.add_argument("-m", "--mail", help="Email address to send the progress to")      subparser.add_argument("-m", "--mail", help="Email address to send the progress to")
863      subparser.add_argument("-w", "--wait", action="store_true",      subparser.add_argument("-w", "--wait", action="store_true",
864                                   help="Wait before trying to retrieve the new version")                                   help="Wait before trying to retrieve the new version")
865        subparser.add_argument("-s", "--submit", action="store_true", dest="submit",
866                                           help="Commit changes and submit")
867      subparser.add_argument("-f", "--force", action="store_true",      subparser.add_argument("-f", "--force", action="store_true",
868                                   help="Force submission")                                   help="Force submission")
869      subparser.set_defaults(      subparser.set_defaults(
Legend:
Removed from v.3653  
changed lines
  Added in v.3654
  ViewVC Help
Powered by ViewVC 1.1.30