/[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 3649 by ovitters, Wed Mar 21 19:17:35 2012 UTC revision 3654 by ovitters, Wed Mar 21 21:49:09 2012 UTC
# Line 46  import time Line 46  import time
46  # version freeze  # version freeze
47  import datetime  import datetime
48    
49    # packages --sort
50    import itertools
51    
52  MEDIA="Core Release Source"  MEDIA="Core Release Source"
53  URL="http://download.gnome.org/sources/"  URL="http://download.gnome.org/sources/"
54  PKGROOT='~/pkgs'  PKGROOT='~/pkgs'
# Line 508  class Upstream(object): Line 511  class Upstream(object):
511    
512          self.names = tarballs          self.names = tarballs
513    
514  def get_downstream_names():  class Downstream(object):
515      re_file = re.compile(r'^(?P<module>.*?)[_-](?:(?P<oldversion>([0-9]+[\.])*[0-9]+)-)?(?P<version>([0-9]+[\.\-])*[0-9]+)\.(?P<format>(?:tar\.|diff\.)?[a-z][a-z0-9]*)$')      re_file = re.compile(r'^(?P<module>.*?)[_-](?:(?P<oldversion>([0-9]+[\.])*[0-9]+)-)?(?P<version>([0-9]+[\.\-])*[0-9]+)\.(?P<format>(?:tar\.|diff\.)?[a-z][a-z0-9]*)$')
516    
517      contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()      def __init__(self):
518            contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()
     FILES = {}  
     TARBALLS = {}  
   
     for line in  contents:  
         try:  
             srpm, version, filename = line.split("|")  
         except ValueError:  
             print >>sys.stderr, line  
             continue  
   
         if '.tar' in filename:  
             r = re_file.match(filename)  
             if r:  
                 fileinfo = r.groupdict()  
                 module = fileinfo['module']  
   
                 if module not in TARBALLS:  
                     TARBALLS[module] = {}  
                 TARBALLS[module][srpm] = version  
   
         if srpm not in FILES:  
             FILES[srpm] = set()  
         FILES[srpm].add(filename)  
   
     return TARBALLS, FILES  
   
 def get_downstream_from_upstream(upstream, version):  
     # Determine the package name  
     downstream, downstream_files = get_downstream_names()  
   
     if upstream not in downstream:  
         raise ValueError("No packages for upstream name: %s" % upstream)  
519    
520      if len(downstream[upstream]) == 1:          FILES = {}
521          return downstream[upstream].keys()          TARBALLS = {}
522    
523      # Directories packages are located in          for line in  contents:
524      root = os.path.expanduser(PKGROOT)              try:
525                    srpm, version, filename = line.split("|")
526                except ValueError:
527                    print >>sys.stderr, line
528                    continue
529    
530      packages = {}              if '.tar' in filename:
531      for package in downstream[upstream].keys():                  r = self.re_file.match(filename)
532          cwd = os.path.join(root, package)                  if r:
533                        fileinfo = r.groupdict()
534                        module = fileinfo['module']
535    
536                        if module not in TARBALLS:
537                            TARBALLS[module] = {}
538                        TARBALLS[module][srpm] = version
539    
540                if srpm not in FILES:
541                    FILES[srpm] = set()
542                FILES[srpm].add(filename)
543    
544            self.tarballs = TARBALLS
545            self.files = FILES
546    
547        def get_downstream_from_upstream(self, upstream, version):
548            if upstream not in self.tarballs:
549                raise ValueError("No packages for upstream name: %s" % upstream)
550    
551            if len(self.tarballs[upstream]) == 1:
552                return self.tarballs[upstream].keys()
553    
554            # Directories packages are located in
555            root = os.path.expanduser(PKGROOT)
556    
557            packages = {}
558            for package in self.tarballs[upstream].keys():
559                cwd = os.path.join(root, package)
560    
561          # Checkout package to ensure the checkout reflects the latest changes              # Checkout package to ensure the checkout reflects the latest changes
562          try:              try:
563              subprocess.check_call(['mgarepo', 'co', package], cwd=root)                  subprocess.check_call(['mgarepo', 'co', package], cwd=root)
564          except subprocess.CalledProcessError:              except subprocess.CalledProcessError:
565              raise ValueError("Multiple packages found and cannot checkout %s" % package)                  raise ValueError("Multiple packages found and cannot checkout %s" % package)
566    
567          # Determine version from spec file              # Determine version from spec file
568          try:              try:
569              packages[package] = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version                  packages[package] = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version
570          except subprocess.CalledProcessError:              except subprocess.CalledProcessError:
571              raise ValueError("Multiple packages found and cannot determine version of %s" % package)                  raise ValueError("Multiple packages found and cannot determine version of %s" % package)
572    
573      # Return all packages reflecting the current version          # Return all packages reflecting the current version
574      matches = [package for package in packages if packages[package] == version]          matches = [package for package in packages if packages[package] == version]
575      if len(matches):          if len(matches):
576          return matches              return matches
577    
578      # Return all packages reflecting the version before the current version          # Return all packages reflecting the version before the current version
579      latest_version = get_latest_version(packages.values(), max_version=version)          latest_version = get_latest_version(packages.values(), max_version=version)
580      matches = [package for package in packages if packages[package] == latest_version]          matches = [package for package in packages if packages[package] == latest_version]
581      if len(matches):          if len(matches):
582          return matches              return matches
583    
584      # Give up          # Give up
585      raise ValueError("Multiple packages found and cannot determine package for version %s" % version)          raise ValueError("Multiple packages found and cannot determine package for version %s" % version)
586    
587  def write_file(path, data):  def write_file(path, data):
588      with tempfile.NamedTemporaryFile(dir=os.path.dirname(path), delete=False) as fdst:      with tempfile.NamedTemporaryFile(dir=os.path.dirname(path), delete=False) as fdst:
# Line 599  def join_streams(show_version=False, onl Line 601  def join_streams(show_version=False, onl
601      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(PKGROOT)
602    
603      upstream = Upstream().names      upstream = Upstream().names
604      downstream, downstream_files = get_downstream_names()      downstream = Downstream()
605    
606      matches = upstream & set(downstream.keys())      matches = upstream & set(downstream.tarballs.keys())
607      for module in matches:      for module in matches:
608          for package in downstream[module].keys():          for package in downstream.tarballs[module].keys():
609              package_version = downstream[module][package]              package_version = downstream.tarballs[module][package]
610              spec_version = None              spec_version = None
611              if show_version or only_diff_version:              if show_version or only_diff_version:
612                  cwd = os.path.join(root, package)                  cwd = os.path.join(root, package)
# Line 616  def join_streams(show_version=False, onl Line 618  def join_streams(show_version=False, onl
618              if only_diff_version and package_version == spec_version:              if only_diff_version and package_version == spec_version:
619                  continue                  continue
620    
621              yield (package, module, package_version, spec_version, downstream_files[package])              yield (package, module, package_version, spec_version, downstream.files[package])
622    
623  def cmd_ls(options, parser):  def cmd_ls(options, parser):
624      for package, module, package_version, spec_version, downstream_files in sorted(join_streams(show_version=options.show_version, only_diff_version=options.diff)):      streams = join_streams(show_version=options.show_version, only_diff_version=options.diff)
625        if options.sort:
626            SORT=dict(zip(options.sort.read().splitlines(), itertools.count()))
627    
628            streams = sorted(streams, key=lambda a: (SORT.get(a[1], 9999), a[0]))
629        else:
630            streams = sorted(streams)
631    
632        for package, module, package_version, spec_version, downstream_files in streams:
633          sys.stdout.write(package)          sys.stdout.write(package)
634          if options.upstream: sys.stdout.write("\t%s" % module)          if options.upstream: sys.stdout.write("\t%s" % module)
635          if options.show_version: sys.stdout.write("\t%s\t%s" % (spec_version, package_version))          if options.show_version: sys.stdout.write("\t%s\t%s" % (spec_version, package_version))
# Line 649  def cmd_package_new_version(options, par Line 659  def cmd_package_new_version(options, par
659      # Determine the package name      # Determine the package name
660      if options.upstream:      if options.upstream:
661          try:          try:
662              package = get_downstream_from_upstream(options.package, options.version)[0]              package = Downstream().get_downstream_from_upstream(options.package, options.version)[0]
663          except ValueError, e:          except ValueError, e:
664              print >>sys.stderr, "ERROR: %s" % e              print >>sys.stderr, "ERROR: %s" % e
665              sys.exit(1)              sys.exit(1)
# Line 687  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 756  def cmd_parse_ftp_release_list(options, Line 764  def cmd_parse_ftp_release_list(options,
764          sys.exit(1)          sys.exit(1)
765    
766      try:      try:
767          packages = get_downstream_from_upstream(module, version)          packages = Downstream().get_downstream_from_upstream(module, version)
768      except ValueError, e:      except ValueError, e:
769          print >>stderr, "ERROR: %s" % e          print >>stderr, "ERROR: %s" % e
770          if options.mail: _send_reply_mail(stdout, msg, options.mail, error=True)          if options.mail: _send_reply_mail(stdout, msg, options.mail, error=True)
# Line 777  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 809  def main(): Line 819  def main():
819                                         help="Show version numbers")                                         help="Show version numbers")
820      subparser.add_argument(      "--diff", action="store_true", dest="diff",      subparser.add_argument(      "--diff", action="store_true", dest="diff",
821                                         help="Only show packages with different version")                                         help="Only show packages with different version")
822        subparser.add_argument(      "--sort", type=argparse.FileType('r', 0),
823                            dest="sort", metavar="FILE",
824                            help="Sort packages according to order in given FILE")
825    
826      subparser.set_defaults(      subparser.set_defaults(
827          func=cmd_ls, upstream=False, show_version=False, diff=False          func=cmd_ls, upstream=False, show_version=False, diff=False
828      )      )
# Line 848  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.3649  
changed lines
  Added in v.3654
  ViewVC Help
Powered by ViewVC 1.1.30