/[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 3568 by ovitters, Mon Mar 19 14:26:13 2012 UTC revision 3653 by ovitters, Wed Mar 21 19:53: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 338  class SpecFile(object): Line 341  class SpecFile(object):
341              subprocess.check_call(['bm', '-p', '--nodeps'], cwd=self.cwd)              subprocess.check_call(['bm', '-p', '--nodeps'], cwd=self.cwd)
342          except subprocess.CalledProcessError:          except subprocess.CalledProcessError:
343              logfile = os.path.join(os.path.dirname(self.path), 'log.%s' % os.path.splitext(os.path.basename(self.path))[0])              logfile = os.path.join(os.path.dirname(self.path), 'log.%s' % os.path.splitext(os.path.basename(self.path))[0])
344              if os.path.exists(logfile)              if os.path.exists(logfile):
345                  subprocess.call(['tail', '-n', '15', logfile])                  subprocess.call(['tail', '-n', '15', logfile])
346              return False              return False
347    
# Line 484  class Patch(object): Line 487  class Patch(object):
487    
488          return self._svn_author          return self._svn_author
489    
 def get_upstream_names():  
     urlopen = urllib2.build_opener()  
   
     good_dir = re.compile('^[-A-Za-z0-9_+.]+/$')  
   
     # Get the files  
     usock = urlopen.open(URL)  
     parser = urllister()  
     parser.feed(usock.read())  
     usock.close()  
     parser.close()  
     files = parser.urls  
   
     tarballs = set([filename.replace('/', '') for filename in files if good_dir.search(filename)])  
490    
491      return tarballs  class Upstream(object):
492    
493  def get_downstream_names():      limit = None
     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]*)$')  
494    
495      contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()      def __init__(self):
496            urlopen = urllib2.build_opener()
497    
498      FILES = {}          good_dir = re.compile('^[-A-Za-z0-9_+.]+/$')
     TARBALLS = {}  
499    
500      for line in  contents:          # Get the files
501          try:          usock = urlopen.open(URL)
502              srpm, version, filename = line.split("|")          parser = urllister()
503          except ValueError:          parser.feed(usock.read())
504              print >>sys.stderr, line          usock.close()
505              continue          parser.close()
506            files = parser.urls
507    
508          if '.tar' in filename:          tarballs = set([filename.replace('/', '') for filename in files if good_dir.search(filename)])
509              r = re_file.match(filename)          if self.limit is not None:
510              if r:              tarballs.intersection_update(self.limit)
                 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)  
511    
512      return TARBALLS, FILES          self.names = tarballs
513    
514  def get_downstream_from_upstream(upstream, version):  class Downstream(object):
515      # Determine the package name      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]*)$')
     downstream, downstream_files = get_downstream_names()  
516    
517      if upstream not in downstream:      def __init__(self):
518          raise ValueError("No packages for upstream name: %s" % upstream)          contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()
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 591  def cmd_co(options, parser): Line 600  def cmd_co(options, parser):
600  def join_streams(show_version=False, only_diff_version=False):  def join_streams(show_version=False, only_diff_version=False):
601      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(PKGROOT)
602    
603      upstream = get_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 609  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          print package,"\t",      if options.sort:
626          if options.upstream: print module, "\t",          SORT=dict(zip(options.sort.read().splitlines(), itertools.count()))
627          if options.show_version: print spec_version, "\t", package_version, "\t",  
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)
634            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))
636          print          print
637    
638  def cmd_patches(options, parser):  def cmd_patches(options, parser):
# Line 642  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 673  def cmd_package_new_version(options, par Line 690  def cmd_package_new_version(options, par
690              sys.stderr(1)              sys.stderr(1)
691    
692          for filename in sources:          for filename in sources:
693              if not is_valid_hash(os.path.join(cwd, "SOURCES", filename), options.algo, options.hexdigest):              path = os.path.join(cwd, "SOURCES", filename)
694                if not is_valid_hash(path, options.algo, options.hexdigest):
695                  print >>sys.stderr, "ERROR: Hash file failed check for %s!" % path                  print >>sys.stderr, "ERROR: Hash file failed check for %s!" % path
696                  print >>sys.stderr, "ERROR: Reverting changes!"                  print >>sys.stderr, "ERROR: Reverting changes!"
697                  subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)                  subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)
# Line 685  def cmd_package_new_version(options, par Line 703  def cmd_package_new_version(options, par
703              # checkin changes              # checkin changes
704              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)
705              # and submit              # and submit
706              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)              # XXX HACK NOT TO AUTO SUBMIT ATM
707                if options.hexdigest is None:
708                    subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)
709          except subprocess.CalledProcessError:          except subprocess.CalledProcessError:
710              sys.exit(1)              sys.exit(1)
711    
712  def cmd_parse_ftp_release_list(options, parser):  def cmd_parse_ftp_release_list(options, parser):
713      def _send_reply_mail(contents, orig_msg, to, error=False):      def _send_reply_mail(contents, orig_msg, to, packages=[], error=False):
714          """Send an reply email"""          """Send an reply email"""
715          contents.seek(0)          contents.seek(0)
716          msg = MIMEText(contents.read(), _charset='utf-8')          msg = MIMEText(contents.read(), _charset='utf-8')
717    
718          if error:          if error:
719              # XXX - ugly              # XXX - ugly
720              contents.seek(0)              contents.seek(0)
721              lastline = contents.read().rstrip().splitlines()[-1]              lastline = contents.read().rstrip().splitlines()[-1]
722              # Remove things like "ERROR: " and so on from the last line              # Remove things like "ERROR: " and so on from the last line
723              lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline)              lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline)
724                # Remove things like "   - " (youri output from mgarepo submit)
725                lastline = re.sub(r'^\s+-\s+', '', lastline)
726              subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"              subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"
727          else:          else:
728              subjecterror = ""              subjecterror = ""
729          msg['Subject'] = "Re: %s%s" % (orig_msg['Subject'], subjecterror)  
730            if packages:
731                subject = "%s %s%s" % (", ".join(packages), orig_msg['X-Module-Version'], subjecterror)
732            else:
733                subject = "Re: %s%s" % (orig_msg['Subject'], subjecterror)
734    
735            msg['Subject'] = subject
736          msg['To'] = to          msg['To'] = to
737          msg["In-Reply-To"] = orig_msg["Message-ID"]          msg["In-Reply-To"] = orig_msg["Message-ID"]
738          msg["References"] = orig_msg["Message-ID"]          msg["References"] = orig_msg["Message-ID"]
# Line 737  def cmd_parse_ftp_release_list(options, Line 766  def cmd_parse_ftp_release_list(options,
766          sys.exit(1)          sys.exit(1)
767    
768      try:      try:
769          packages = get_downstream_from_upstream(module, version)          packages = Downstream().get_downstream_from_upstream(module, version)
770      except ValueError, e:      except ValueError, e:
771          print >>stderr, "ERROR: %s" % e          print >>stderr, "ERROR: %s" % e
772          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 765  def cmd_parse_ftp_release_list(options, Line 794  def cmd_parse_ftp_release_list(options,
794          if subprocess.call(cmd, stdout=stdout, stderr=stderr):          if subprocess.call(cmd, stdout=stdout, stderr=stderr):
795              error = True              error = True
796    
797      if options.mail: _send_reply_mail(stdout, msg, options.mail, error=error)      if options.mail: _send_reply_mail(stdout, msg, options.mail, packages=packages, error=error)
798    
799  def main():  def main():
800      description = """Mageia GNOME commands."""      description = """Mageia GNOME commands."""
801      epilog="""Report bugs to Olav Vitters"""      epilog="""Report bugs to Olav Vitters"""
802      parser = argparse.ArgumentParser(description=description,epilog=epilog)      parser = argparse.ArgumentParser(description=description,epilog=epilog)
803        parser.add_argument("-l", "--limit", type=argparse.FileType('r', 0),
804                            dest="limit_upstream", metavar="FILE",
805                            help="File containing upstream names")
806    
807      # SUBPARSERS      # SUBPARSERS
808      subparsers = parser.add_subparsers(title='subcommands')      subparsers = parser.add_subparsers(title='subcommands')
# Line 787  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 837  def main(): Line 873  def main():
873          sys.exit(2)          sys.exit(2)
874    
875      options = parser.parse_args()      options = parser.parse_args()
876        if options.limit_upstream:
877            Upstream.limit = set(options.limit_upstream.read().strip("\n").splitlines())
878    
879      try:      try:
880          options.func(options, parser)          options.func(options, parser)

Legend:
Removed from v.3568  
changed lines
  Added in v.3653

  ViewVC Help
Powered by ViewVC 1.1.30