/[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 3570 by ovitters, Mon Mar 19 15:49:20 2012 UTC revision 5288 by ovitters, Sat Aug 4 18:32:33 2012 UTC
# Line 46  import time Line 46  import time
46  # version freeze  # version freeze
47  import datetime  import datetime
48    
49  MEDIA="Core Release Source"  # packages --sort
50  URL="http://download.gnome.org/sources/"  import itertools
51  PKGROOT='~/pkgs'  
52    # check-latest
53    import requests
54    
55  SLEEP_INITIAL=180  SLEEP_INITIAL=180
56  SLEEP_REPEAT=30  SLEEP_REPEAT=30
57  SLEEP_TIMES=20  SLEEP_TIMES=20
# Line 79  def get_latest_version(versions, max_ver Line 82  def get_latest_version(versions, max_ver
82              latest = version              latest = version
83      return latest      return latest
84    
85    def get_safe_max_version(version):
86        if not re_majmin.match(version):
87            return None
88    
89        majmin_nr = map(long, re_majmin.sub(r'\1', version).split('.'))
90    
91        if majmin_nr[1] % 2 == 0:
92            return "%d.%d" % (majmin_nr[0], majmin_nr[1] + 1)
93        else:
94            return "%d.%d" % (majmin_nr[0], majmin_nr[1] + 2)
95    
96  def judge_version_increase(version_old, version_new):  def judge_version_increase(version_old, version_new):
97          """Judge quality of version increase:          """Judge quality of version increase:
98    
# Line 484  class Patch(object): Line 498  class Patch(object):
498    
499          return self._svn_author          return self._svn_author
500    
 def get_upstream_names():  
     urlopen = urllib2.build_opener()  
501    
502      good_dir = re.compile('^[-A-Za-z0-9_+.]+/$')  class Upstream(object):
503    
504      # Get the files      URL="http://download.gnome.org/sources/"
505      usock = urlopen.open(URL)      limit = None
506      parser = urllister()      _cache_versions = {}
507      parser.feed(usock.read())  
508      usock.close()      def __init__(self):
509      parser.close()          urlopen = urllib2.build_opener()
510      files = parser.urls  
511            good_dir = re.compile('^[-A-Za-z0-9_+.]+/$')
512    
513            # Get the files
514            usock = urlopen.open(self.URL)
515            parser = urllister()
516            parser.feed(usock.read())
517            usock.close()
518            parser.close()
519            files = parser.urls
520    
521            tarballs = set([filename.replace('/', '') for filename in files if good_dir.search(filename)])
522            if self.limit is not None:
523                tarballs.intersection_update(self.limit)
524    
525      tarballs = set([filename.replace('/', '') for filename in files if good_dir.search(filename)])          self.names = tarballs
526    
527      return tarballs      @classmethod
528        def versions(cls, module):
529            # XXX - ugly
530            if module not in cls._cache_versions:
531                versions = None
532    
533                url = '%s%s/cache.json' % (cls.URL, module)
534                r = requests.get(url)
535                j = r.json
536                if j is not None and len(j) > 2 and module in j[2]:
537                    versions = j[2][module]
538    
539  def get_downstream_names():              cls._cache_versions[module] = versions
     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]*)$')  
540    
541      contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()          return cls._cache_versions[module]
542    
543      FILES = {}  class Downstream(object):
544      TARBALLS = {}      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]*)$')
545    
546      for line in  contents:      MEDIA="Core Release Source"
547          try:      PKGROOT='~/pkgs'
548              srpm, version, filename = line.split("|")      DISTRO=None
         except ValueError:  
             print >>sys.stderr, line  
             continue  
549    
550          if '.tar' in filename:      def __init__(self):
551              r = re_file.match(filename)          contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", self.MEDIA], close_fds=True).strip("\n").splitlines()
             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)  
552    
553      return TARBALLS, FILES          FILES = {}
554            TARBALLS = {}
555    
556  def get_downstream_from_upstream(upstream, version):          for line in  contents:
557      # Determine the package name              try:
558      downstream, downstream_files = get_downstream_names()                  srpm, version, filename = line.split("|")
559                except ValueError:
560                    print >>sys.stderr, line
561                    continue
562    
563      if upstream not in downstream:              if '.tar' in filename:
564          raise ValueError("No packages for upstream name: %s" % upstream)                  r = self.re_file.match(filename)
565                    if r:
566                        fileinfo = r.groupdict()
567                        module = fileinfo['module']
568    
569                        if module not in TARBALLS:
570                            TARBALLS[module] = {}
571                        TARBALLS[module][srpm] = version
572    
573                if srpm not in FILES:
574                    FILES[srpm] = set()
575                FILES[srpm].add(filename)
576    
577      if len(downstream[upstream]) == 1:          self.tarballs = TARBALLS
578          return downstream[upstream].keys()          self.files = FILES
579    
580      # Directories packages are located in      @classmethod
581      root = os.path.expanduser(PKGROOT)      def co(cls, package, cwd=None):
582            if cwd is None:
583      packages = {}              cwd = os.path.expanduser(cls.PKGROOT)
584      for package in downstream[upstream].keys():  
585          cwd = os.path.join(root, package)          cmd = ['mgarepo', 'co']
586            if cls.DISTRO:
587                cmd.extend(('-d', cls.DISTRO))
588            cmd.append(package)
589            return subprocess.check_call(cmd, cwd=cwd)
590    
591        def get_downstream_from_upstream(self, upstream, version):
592            if upstream not in self.tarballs:
593                raise ValueError("No packages for upstream name: %s" % upstream)
594    
595            if len(self.tarballs[upstream]) == 1:
596                return self.tarballs[upstream].keys()
597    
598            # Directories packages are located in
599            root = os.path.expanduser(self.PKGROOT)
600    
601            packages = {}
602            for package in self.tarballs[upstream].keys():
603                cwd = os.path.join(root, package)
604    
605          # Checkout package to ensure the checkout reflects the latest changes              # Checkout package to ensure the checkout reflects the latest changes
606          try:              try:
607              subprocess.check_call(['mgarepo', 'co', package], cwd=root)                  self.co(package, cwd=root)
608          except subprocess.CalledProcessError:              except subprocess.CalledProcessError:
609              raise ValueError("Multiple packages found and cannot checkout %s" % package)                  raise ValueError("Multiple packages found and cannot checkout %s" % package)
610    
611          # Determine version from spec file              # Determine version from spec file
612          try:              try:
613              packages[package] = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version                  packages[package] = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version
614          except subprocess.CalledProcessError:              except subprocess.CalledProcessError:
615              raise ValueError("Multiple packages found and cannot determine version of %s" % package)                  raise ValueError("Multiple packages found and cannot determine version of %s" % package)
616    
617      # Return all packages reflecting the current version          # Return all packages reflecting the current version
618      matches = [package for package in packages if packages[package] == version]          matches = [package for package in packages if packages[package] == version]
619      if len(matches):          if len(matches):
620          return matches              return matches
621    
622      # Return all packages reflecting the version before the current version          # Return all packages reflecting the version before the current version
623      latest_version = get_latest_version(packages.values(), max_version=version)          latest_version = get_latest_version(packages.values(), max_version=version)
624      matches = [package for package in packages if packages[package] == latest_version]          matches = [package for package in packages if packages[package] == latest_version]
625      if len(matches):          if len(matches):
626          return matches              return matches
627    
628      # Give up          # Give up
629      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)
630    
631  def write_file(path, data):  def write_file(path, data):
632      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 582  def write_file(path, data): Line 635  def write_file(path, data):
635          os.rename(fdst.name, path)          os.rename(fdst.name, path)
636    
637  def cmd_co(options, parser):  def cmd_co(options, parser):
     root = os.path.expanduser(PKGROOT)  
   
638      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):
639          print "%s => %s" % (module, package)          print "%s => %s" % (module, package)
640          subprocess.call(['mgarepo', 'co', package], cwd=root)          try:
641                Downstream.co(package)
642            except subprocess.CalledProcessError:
643                pass
644    
645  def join_streams(show_version=False, only_diff_version=False):  def join_streams(show_version=False, only_diff_version=False):
646      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(Downstream.PKGROOT)
647    
648      upstream = get_upstream_names()      upstream = Upstream().names
649      downstream, downstream_files = get_downstream_names()      downstream = Downstream()
650    
651      matches = upstream & set(downstream.keys())      matches = upstream & set(downstream.tarballs.keys())
652      for module in matches:      for module in matches:
653          for package in downstream[module].keys():          for package in downstream.tarballs[module].keys():
654              package_version = downstream[module][package]              package_version = downstream.tarballs[module][package]
655              spec_version = None              spec_version = None
656              if show_version or only_diff_version:              if show_version or only_diff_version:
657                  cwd = os.path.join(root, package)                  cwd = os.path.join(root, package)
# Line 609  def join_streams(show_version=False, onl Line 663  def join_streams(show_version=False, onl
663              if only_diff_version and package_version == spec_version:              if only_diff_version and package_version == spec_version:
664                  continue                  continue
665    
666              yield (package, module, package_version, spec_version, downstream_files[package])              yield (package, module, package_version, spec_version, downstream.files[package])
667    
668  def cmd_ls(options, parser):  def cmd_ls(options, parser):
669      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)
670          print package,"\t",      if options.sort:
671          if options.upstream: print module, "\t",          SORT=dict(zip(options.sort.read().splitlines(), itertools.count()))
672          if options.show_version: print spec_version, "\t", package_version, "\t",  
673            streams = sorted(streams, key=lambda a: (SORT.get(a[1], 9999), a[0]))
674        else:
675            streams = sorted(streams)
676    
677        for package, module, package_version, spec_version, downstream_files in streams:
678            sys.stdout.write(package)
679            if options.upstream: sys.stdout.write("\t%s" % module)
680            if options.show_version: sys.stdout.write("\t%s\t%s" % (spec_version, package_version))
681            print
682    
683    def cmd_check_latest(options, parser):
684        streams = join_streams(show_version=True)
685    
686        for package, module, package_version, spec_version, downstream_files in streams:
687            sys.stdout.write(package)
688            sys.stdout.write("\t%s\t%s" % (spec_version, package_version))
689    
690            safe_max_version = get_safe_max_version(spec_version)
691    
692            versions = Upstream.versions(module)
693            if versions:
694                latest_version = get_latest_version(versions)
695                safe_version = get_latest_version(versions, safe_max_version)
696    
697                if version_cmp(latest_version, spec_version) < 0: latest_version = 'N/A'
698                if version_cmp(safe_version, spec_version) < 0: safe_version = 'N/A'
699    
700                sys.stdout.write("\t%s" % latest_version)
701                sys.stdout.write("\t%s" % safe_version)
702          print          print
703    
704  def cmd_patches(options, parser):  def cmd_patches(options, parser):
705      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(Downstream.PKGROOT)
706    
707      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):
708          for filename in downstream_files:          for filename in downstream_files:
# Line 642  def cmd_package_new_version(options, par Line 725  def cmd_package_new_version(options, par
725      # Determine the package name      # Determine the package name
726      if options.upstream:      if options.upstream:
727          try:          try:
728              package = get_downstream_from_upstream(options.package, options.version)[0]              package = Downstream().get_downstream_from_upstream(options.package, options.version)[0]
729          except ValueError, e:          except ValueError, e:
730              print >>sys.stderr, "ERROR: %s" % e              print >>sys.stderr, "ERROR: %s" % e
731              sys.exit(1)              sys.exit(1)
# Line 650  def cmd_package_new_version(options, par Line 733  def cmd_package_new_version(options, par
733          package = options.package          package = options.package
734    
735      # Directories packages are located in      # Directories packages are located in
736      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(Downstream.PKGROOT)
737      cwd = os.path.join(root, package)      cwd = os.path.join(root, package)
738    
739      # Checkout package to ensure the checkout reflects the latest changes      # Checkout package to ensure the checkout reflects the latest changes
740      try:      try:
741          subprocess.check_call(['mgarepo', 'co', package], cwd=root)          Downstream.co(package, cwd=root)
742      except subprocess.CalledProcessError:      except subprocess.CalledProcessError:
743          sys.exit(1)          sys.exit(1)
744    
# Line 673  def cmd_package_new_version(options, par Line 756  def cmd_package_new_version(options, par
756              sys.stderr(1)              sys.stderr(1)
757    
758          for filename in sources:          for filename in sources:
759              if not is_valid_hash(os.path.join(cwd, "SOURCES", filename), options.algo, options.hexdigest):              path = os.path.join(cwd, "SOURCES", filename)
760                if not is_valid_hash(path, options.algo, options.hexdigest):
761                  print >>sys.stderr, "ERROR: Hash file failed check for %s!" % path                  print >>sys.stderr, "ERROR: Hash file failed check for %s!" % path
762                  print >>sys.stderr, "ERROR: Reverting changes!"                  print >>sys.stderr, "ERROR: Reverting changes!"
763                  subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)                  subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)
764                  sys.exit(1)                  sys.exit(1)
765    
766      # We can even checkin and submit :-)      try:
767      if options.submit:          # If we made it this far, checkin the changes
768          try:          subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)
769              # checkin changes  
770              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)          # Submit is optional
771              # and submit          if options.submit:
772              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)
773          except subprocess.CalledProcessError:      except subprocess.CalledProcessError:
774              sys.exit(1)          sys.exit(1)
775    
776  def cmd_parse_ftp_release_list(options, parser):  def cmd_parse_ftp_release_list(options, parser):
777      def _send_reply_mail(contents, orig_msg, to, error=False):      def _send_reply_mail(contents, orig_msg, to, packages=[], error=False):
778          """Send an reply email"""          """Send an reply email"""
779          contents.seek(0)          contents.seek(0)
780          msg = MIMEText(contents.read(), _charset='utf-8')          msg = MIMEText(contents.read(), _charset='utf-8')
781    
782          if error:          if error:
783              # XXX - ugly              # XXX - ugly
784              contents.seek(0)              contents.seek(0)
# Line 705  def cmd_parse_ftp_release_list(options, Line 790  def cmd_parse_ftp_release_list(options,
790              subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"              subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"
791          else:          else:
792              subjecterror = ""              subjecterror = ""
793          msg['Subject'] = "Re: %s%s" % (orig_msg['Subject'], subjecterror)  
794            if packages:
795                subject = "%s %s%s" % (", ".join(packages), orig_msg['X-Module-Version'], subjecterror)
796            else:
797                subject = "Re: %s%s" % (orig_msg['Subject'], subjecterror)
798    
799            msg['Subject'] = subject
800          msg['To'] = to          msg['To'] = to
801          msg["In-Reply-To"] = orig_msg["Message-ID"]          msg["In-Reply-To"] = orig_msg["Message-ID"]
802          msg["References"] = orig_msg["Message-ID"]          msg["References"] = orig_msg["Message-ID"]
# Line 739  def cmd_parse_ftp_release_list(options, Line 830  def cmd_parse_ftp_release_list(options,
830          sys.exit(1)          sys.exit(1)
831    
832      try:      try:
833          packages = get_downstream_from_upstream(module, version)          packages = Downstream().get_downstream_from_upstream(module, version)
834      except ValueError, e:      except ValueError, e:
835          print >>stderr, "ERROR: %s" % e          print >>stderr, "ERROR: %s" % e
836          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 760  def cmd_parse_ftp_release_list(options, Line 851  def cmd_parse_ftp_release_list(options,
851    
852      error = False      error = False
853      for package in packages:      for package in packages:
854          cmd = ['mga-gnome', 'increase', '--submit', '--hash', hexdigest]          cmd = ['mga-gnome', 'increase', '--hash', hexdigest]
855            if options.submit:
856                cmd.append('--submit')
857          if options.force:          if options.force:
858              cmd.append('--force')              cmd.append('--force')
859          cmd.extend((package, version))          cmd.extend((package, version))
860          if subprocess.call(cmd, stdout=stdout, stderr=stderr):          if subprocess.call(cmd, stdout=stdout, stderr=stderr):
861              error = True              error = True
862    
863      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)
864    
865  def main():  def main():
866      description = """Mageia GNOME commands."""      description = """Mageia GNOME commands."""
867      epilog="""Report bugs to Olav Vitters"""      epilog="""Report bugs to Olav Vitters"""
868      parser = argparse.ArgumentParser(description=description,epilog=epilog)      parser = argparse.ArgumentParser(description=description,epilog=epilog)
869        parser.add_argument("-l", "--limit", type=argparse.FileType('r', 0),
870                            dest="limit_upstream", metavar="FILE",
871                            help="File containing upstream names")
872        parser.add_argument("-d", "--distro", action="store", dest="distro",
873                                           help="Distribution release")
874    
875      # SUBPARSERS      # SUBPARSERS
876      subparsers = parser.add_subparsers(title='subcommands')      subparsers = parser.add_subparsers(title='subcommands')
# Line 789  def main(): Line 887  def main():
887                                         help="Show version numbers")                                         help="Show version numbers")
888      subparser.add_argument(      "--diff", action="store_true", dest="diff",      subparser.add_argument(      "--diff", action="store_true", dest="diff",
889                                         help="Only show packages with different version")                                         help="Only show packages with different version")
890        subparser.add_argument(      "--sort", type=argparse.FileType('r', 0),
891                            dest="sort", metavar="FILE",
892                            help="Sort packages according to order in given FILE")
893    
894      subparser.set_defaults(      subparser.set_defaults(
895          func=cmd_ls, upstream=False, show_version=False, diff=False          func=cmd_ls, upstream=False, show_version=False, diff=False
896      )      )
897    
898        subparser = subparsers.add_parser('check-latest', help='check for latest version of packages')
899        subparser.set_defaults(
900            func=cmd_check_latest
901        )
902    
903      subparser = subparsers.add_parser('patches', help='list all GNOME patches')      subparser = subparsers.add_parser('patches', help='list all GNOME patches')
904      subparser.add_argument("-p", "--path", action="store_true", dest="path",      subparser.add_argument("-p", "--path", action="store_true", dest="path",
905                                         help="Show full path to patch")                                         help="Show full path to patch")
# Line 820  def main(): Line 927  def main():
927      subparser.add_argument("--hash", dest="hexdigest",      subparser.add_argument("--hash", dest="hexdigest",
928                                         help="Hexdigest of the hash")                                         help="Hexdigest of the hash")
929      subparser.set_defaults(      subparser.set_defaults(
930          func=cmd_package_new_version, submit=False, upstream=False, hexdigest=None, algo="sha256",          func=cmd_package_new_version, submit=True, upstream=False, hexdigest=None, algo="sha256",
931          force=False          force=False
932      )      )
933    
# Line 828  def main(): Line 935  def main():
935      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")
936      subparser.add_argument("-w", "--wait", action="store_true",      subparser.add_argument("-w", "--wait", action="store_true",
937                                   help="Wait before trying to retrieve the new version")                                   help="Wait before trying to retrieve the new version")
938        subparser.add_argument("-s", "--submit", action="store_true", dest="submit",
939                                           help="Commit changes and submit")
940      subparser.add_argument("-f", "--force", action="store_true",      subparser.add_argument("-f", "--force", action="store_true",
941                                   help="Force submission")                                   help="Force submission")
942      subparser.set_defaults(      subparser.set_defaults(
# Line 839  def main(): Line 948  def main():
948          sys.exit(2)          sys.exit(2)
949    
950      options = parser.parse_args()      options = parser.parse_args()
951        if options.limit_upstream:
952            Upstream.limit = set(options.limit_upstream.read().strip("\n").splitlines())
953    
954        if options.distro:
955            Downstream.PKGROOT = os.path.join('~/pkgs', options.distro)
956            Downstream.MEDIA = "Core Release %s Source" % options.distro
957            Downstream.DISTRO = options.distro
958    
959      try:      try:
960          options.func(options, parser)          options.func(options, parser)
Legend:
Removed from v.3570  
changed lines
  Added in v.5288
  ViewVC Help
Powered by ViewVC 1.1.30