/[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 3180 by ovitters, Fri Mar 2 21:25:11 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  SLEEP_INITIAL=300  # check-latest
53    import requests
54    
55    SLEEP_INITIAL=180
56    SLEEP_REPEAT=30
57    SLEEP_TIMES=20
58    
59  re_majmin = re.compile(r'^([0-9]+\.[0-9]+).*')  re_majmin = re.compile(r'^([0-9]+\.[0-9]+).*')
60  re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')  re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')
# Line 77  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 257  class SpecFile(object): Line 273  class SpecFile(object):
273                          else spec.sources()                          else spec.sources()
274          return dict((os.path.basename(name), name) for name, no, flags in srclist)          return dict((os.path.basename(name), name) for name, no, flags in srclist)
275    
276      def update(self, version):      def update(self, version, force=False):
277          """Update specfile (increase version)"""          """Update specfile (increase version)"""
278          cur_version = self.version          cur_version = self.version
279    
# Line 269  class SpecFile(object): Line 285  class SpecFile(object):
285    
286          if judgement < 5:          if judgement < 5:
287              print "WARNING: %s!" % (msg)              print "WARNING: %s!" % (msg)
288              return False              if not force: return False
289    
290          # XXX - os.path.join is hackish          # XXX - os.path.join is hackish
291          if subprocess.check_output(["svn", "diff", os.path.join(self.path, '..')]) != '':          svn_diff_output = subprocess.check_output(["svn", "diff", os.path.join(self.path, '..')])
292            if svn_diff_output != '':
293                print svn_diff_output
294              print >>sys.stderr, "ERROR: Package has uncommitted changes!"              print >>sys.stderr, "ERROR: Package has uncommitted changes!"
295              return False              if not force:
296                    return False
297    
298                # Forcing package submission: revert changes
299                try:
300                    print >>sys.stderr, "WARNING: Force used; reverting svn changes"
301                    subprocess.check_call(["svn", "revert", "-R", os.path.join(self.path, '..')])
302                except subprocess.CalledProcessError:
303                    return False
304    
305          with open(self.path, "rw") as f:          with open(self.path, "rw") as f:
306              data = f.read()              data = f.read()
# Line 302  class SpecFile(object): Line 328  class SpecFile(object):
328              print "ERROR: Increased version to %s, but RPM doesn't agree!?!" % version              print "ERROR: Increased version to %s, but RPM doesn't agree!?!" % version
329              return False              return False
330    
331    
332            # Try to download the new tarball various times and wait between attempts
333            tries = 0
334            while tries < SLEEP_TIMES:
335                tries += 1
336                if tries > 1: time.sleep(SLEEP_REPEAT)
337                try:
338                    # Download new tarball
339                    subprocess.check_call(['mgarepo', 'sync', '-d'], cwd=self.cwd)
340                    # success, so exit loop
341                    break
342                except subprocess.CalledProcessError, e:
343                    # mgarepo sync returns 1 if the tarball cannot be downloaded
344                    if e.returncode != 1:
345                        return False
346            else:
347                return False
348    
349    
350          try:          try:
             # Download new tarball  
             subprocess.check_call(['mgarepo', 'sync', '-d'], cwd=self.cwd)  
351              # Check patches still apply              # Check patches still apply
352              subprocess.check_call(['bm', '-p', '--nodeps'], cwd=self.cwd)              subprocess.check_call(['bm', '-p', '--nodeps'], cwd=self.cwd)
353          except subprocess.CalledProcessError:          except subprocess.CalledProcessError:
354                logfile = os.path.join(os.path.dirname(self.path), 'log.%s' % os.path.splitext(os.path.basename(self.path))[0])
355                if os.path.exists(logfile):
356                    subprocess.call(['tail', '-n', '15', logfile])
357              return False              return False
358    
359          return True          return True
# Line 452  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        URL="http://download.gnome.org/sources/"
505        limit = None
506        _cache_versions = {}
507    
508        def __init__(self):
509            urlopen = urllib2.build_opener()
510    
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      # Get the files          self.names = tarballs
526      usock = urlopen.open(URL)  
527      parser = urllister()      @classmethod
528      parser.feed(usock.read())      def versions(cls, module):
529      usock.close()          # XXX - ugly
530      parser.close()          if module not in cls._cache_versions:
531      files = parser.urls              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      tarballs = set([filename.replace('/', '') for filename in files if good_dir.search(filename)])              cls._cache_versions[module] = versions
540    
541      return tarballs          return cls._cache_versions[module]
542    
543  def get_downstream_names():  class Downstream(object):
544      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]*)$')
545    
546      contents = subprocess.check_output(['urpmf', '--files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()      MEDIA="Core Release Source"
547        PKGROOT='~/pkgs'
548        DISTRO=None
549    
550      FILES = {}      def __init__(self):
551      TARBALLS = {}          contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", self.MEDIA], close_fds=True).strip("\n").splitlines()
552    
553      for line in  contents:          FILES = {}
554          try:          TARBALLS = {}
             srpm, filename = line.split(":")  
         except ValueError:  
             print >>sys.stderr, line  
             continue  
555    
556          if '.tar' in filename:          for line in  contents:
557              r = re_file.match(filename)              try:
558              if r:                  srpm, version, filename = line.split("|")
559                  fileinfo = r.groupdict()              except ValueError:
560                  module = fileinfo['module']                  print >>sys.stderr, line
561                    continue
                 if module not in TARBALLS:  
                     TARBALLS[module] = set()  
                 TARBALLS[module].add(srpm)  
   
         if srpm not in FILES:  
             FILES[srpm] = set()  
         FILES[srpm].add(filename)  
562    
563      return TARBALLS, FILES              if '.tar' in filename:
564                    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  def get_downstream_from_upstream(upstream, version):          self.tarballs = TARBALLS
578      # Determine the package name          self.files = FILES
579      downstream, downstream_files = get_downstream_names()  
580        @classmethod
581        def co(cls, package, cwd=None):
582            if cwd is None:
583                cwd = os.path.expanduser(cls.PKGROOT)
584    
585            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
606                try:
607                    self.co(package, cwd=root)
608                except subprocess.CalledProcessError:
609                    raise ValueError("Multiple packages found and cannot checkout %s" % package)
610    
611      if upstream not in downstream:              # Determine version from spec file
612          raise ValueError("No packages for upstream name: %s" % upstream)              try:
613                    packages[package] = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version
614                except subprocess.CalledProcessError:
615                    raise ValueError("Multiple packages found and cannot determine version of %s" % package)
616    
617      if len(downstream[upstream]) != 1:          # Return all packages reflecting the current version
618          # XXX - Make it more intelligent          matches = [package for package in packages if packages[package] == version]
619          raise ValueError("Multiple packages found for %s: %s" % (upstream, ", ".join(downstream[upstream])))          if len(matches):
620                return matches
621    
622            # Return all packages reflecting the version before the current version
623            latest_version = get_latest_version(packages.values(), max_version=version)
624            matches = [package for package in packages if packages[package] == latest_version]
625            if len(matches):
626                return matches
627    
628      return list(downstream[upstream])          # Give up
629            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 520  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):
638      upstream = get_upstream_names()      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):
639      downstream, downstream_files = get_downstream_names()          print "%s => %s" % (module, package)
640            try:
641                Downstream.co(package)
642            except subprocess.CalledProcessError:
643                pass
644    
645      cwd = os.path.expanduser(PKGROOT)  def join_streams(show_version=False, only_diff_version=False):
646        root = os.path.expanduser(Downstream.PKGROOT)
647    
648      matches = upstream & set(downstream.keys())      upstream = Upstream().names
649      for module in matches:      downstream = Downstream()
         print module, "\t".join(downstream[module])  
         for package in downstream[module]:  
             subprocess.call(['mgarepo', 'co', package], cwd=cwd)  
   
 def join_streams():  
     upstream = get_upstream_names()  
     downstream, downstream_files = get_downstream_names()  
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]:          for package in downstream.tarballs[module].keys():
654              yield (package, module)              package_version = downstream.tarballs[module][package]
655                spec_version = None
656                if show_version or only_diff_version:
657                    cwd = os.path.join(root, package)
658                    try:
659                        spec_version = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version
660                    except subprocess.CalledProcessError:
661                        spec_version = 'N/A'
662    
663                if only_diff_version and package_version == spec_version:
664                    continue
665    
666                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 in sorted(join_streams()):      streams = join_streams(show_version=options.show_version, only_diff_version=options.diff)
670          print "\t".join((package, module)) if options.upstream else package      if options.sort:
671            SORT=dict(zip(options.sort.read().splitlines(), itertools.count()))
672    
673  def cmd_patches(options, parser):          streams = sorted(streams, key=lambda a: (SORT.get(a[1], 9999), a[0]))
674      upstream = get_upstream_names()      else:
675      downstream, downstream_files = get_downstream_names()          streams = sorted(streams)
676    
677      path = os.path.expanduser(PKGROOT)      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
703    
704      import pprint  def cmd_patches(options, parser):
705        root = os.path.expanduser(Downstream.PKGROOT)
706    
707      matches = upstream & set(downstream.keys())      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):
708      for module in sorted(matches):          for filename in downstream_files:
709          for srpm in downstream[module]:              if '.patch' in filename or '.diff' in filename:
710              for filename in downstream_files[srpm]:  
711                  if '.patch' in filename or '.diff' in filename:                  p = Patch(os.path.join(root, package, "SOURCES", filename), show_path=options.path)
712                    valid = ""
713                      p = Patch(os.path.join(path, srpm, "SOURCES", filename), show_path=options.path)                  forwarded = ""
714                      valid = ""                  if p.dep3['headers']:
715                      forwarded = ""                      forwarded = p.dep3['headers'].get('Forwarded', "no")
716                      if p.dep3['headers']:                      if p.dep3['valid']:
717                          forwarded = p.dep3['headers'].get('Forwarded', "no")                          valid="VALID"
718                          if p.dep3['valid']:                  print "\t".join((module, package, str(p), forwarded, valid))
                             valid="VALID"  
                     print "\t".join((module, srpm, str(p), forwarded, valid))  
719    
720  def cmd_dep3(options, parser):  def cmd_dep3(options, parser):
721      p = Patch(options.patch)      p = Patch(options.patch)
# Line 575  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 583  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    
745      # SpecFile class handles the actual version+release change      # SpecFile class handles the actual version+release change
746      s = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package))      s = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package))
747      print "%s => %s" % (s.version, options.version)      print "%s => %s" % (s.version, options.version)
748      if not s.update(options.version):      if not s.update(options.version, force=options.force):
749          sys.exit(1)          sys.exit(1)
750    
751      # Check hash, if given      # Check hash, if given
# Line 606  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      # XXX - not working yet      def _send_reply_mail(contents, orig_msg, to, packages=[], error=False):
     def _send_reply_mail(contents, orig_msg, to, 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          msg['Subject'] = "Re: %s%s" % (orig_msg['Subject'], " (ERROR)" if error else "")  
782            if error:
783                # XXX - ugly
784                contents.seek(0)
785                lastline = contents.read().rstrip().splitlines()[-1]
786                # Remove things like "ERROR: " and so on from the last line
787                lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline)
788                # Remove things like "   - " (youri output from mgarepo submit)
789                lastline = re.sub(r'^\s+-\s+', '', lastline)
790                subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"
791            else:
792                subjecterror = ""
793    
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 652  def cmd_parse_ftp_release_list(options, Line 820  def cmd_parse_ftp_release_list(options,
820          stdout = sys.stdout          stdout = sys.stdout
821          stderr = sys.stderr          stderr = sys.stderr
822    
     version_freeze = datetime.datetime(2012,3,7,23,59,0)  
     now = datetime.datetime.utcnow()  
     if now > version_freeze:  
         print >>stderr, "ERROR: Past version freeze"  
         if options.mail: _send_reply_mail(stdout, msg, options.mail, error=True)  
         sys.exit(1)  
   
823      try:      try:
824          module = msg['X-Module-Name']          module = msg['X-Module-Name']
825          version = msg['X-Module-Version']          version = msg['X-Module-Version']
# Line 669  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 679  def cmd_parse_ftp_release_list(options, Line 840  def cmd_parse_ftp_release_list(options,
840          # maildrop aborts and will try to deliver after 5min          # maildrop aborts and will try to deliver after 5min
841          # fork to avoid this          # fork to avoid this
842          if os.fork() != 0: sys.exit(0)          if os.fork() != 0: sys.exit(0)
843          time.sleep(SLEEP_INITIAL)          # wait SLEEP_INITIAL after the message was sent
844            secs = SLEEP_INITIAL
845            t = email.utils.parsedate_tz(msg['Date'])
846            if t is not None:
847                msg_time = email.utils.mktime_tz(t)
848                secs = SLEEP_INITIAL - (time.time() - msg_time)
849    
850            if secs > 0: time.sleep(secs)
851    
852      error = False      error = False
853      for package in packages:      for package in packages:
854          if subprocess.call(['mga-gnome', 'increase', '--submit', '--hash', hexdigest, package, version], stdout=stdout, stderr=stderr):          cmd = ['mga-gnome', 'increase', '--hash', hexdigest]
855            if options.submit:
856                cmd.append('--submit')
857            if options.force:
858                cmd.append('--force')
859            cmd.extend((package, version))
860            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 704  def main(): Line 883  def main():
883      subparser = subparsers.add_parser('packages', help='list all GNOME packages')      subparser = subparsers.add_parser('packages', help='list all GNOME packages')
884      subparser.add_argument("-m", "--m", action="store_true", dest="upstream",      subparser.add_argument("-m", "--m", action="store_true", dest="upstream",
885                                         help="Show upstream module")                                         help="Show upstream module")
886        subparser.add_argument(      "--version", action="store_true", dest="show_version",
887                                           help="Show version numbers")
888        subparser.add_argument(      "--diff", action="store_true", dest="diff",
889                                           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(
895            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(      subparser.set_defaults(
900          func=cmd_ls, upstream=False          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')
# Line 724  def main(): Line 916  def main():
916      subparser = subparsers.add_parser('increase', help='Increase version number')      subparser = subparsers.add_parser('increase', help='Increase version number')
917      subparser.add_argument("package", help="Package name")      subparser.add_argument("package", help="Package name")
918      subparser.add_argument("version", help="Version number")      subparser.add_argument("version", help="Version number")
919        subparser.add_argument("-f", "--force", action="store_true", dest="force",
920                                           help="Override warnings, just do it")
921      subparser.add_argument("-u", "--upstream", action="store_true", dest="upstream",      subparser.add_argument("-u", "--upstream", action="store_true", dest="upstream",
922                                         help="Package name reflects the upstream name")                                         help="Package name reflects the upstream name")
923      subparser.add_argument("-s", "--submit", action="store_true", dest="submit",      subparser.add_argument("-s", "--submit", action="store_true", dest="submit",
# Line 733  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
932      )      )
933    
934      subparser = subparsers.add_parser('gnome-release-email', help='Submit packages based on GNOME ftp-release-list email')      subparser = subparsers.add_parser('gnome-release-email', help='Submit packages based on GNOME ftp-release-list email')
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",
941                                     help="Force submission")
942      subparser.set_defaults(      subparser.set_defaults(
943          func=cmd_parse_ftp_release_list          func=cmd_parse_ftp_release_list, force=False, wait=False
944      )      )
945    
946      if len(sys.argv) == 1:      if len(sys.argv) == 1:
# Line 749  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)
# Line 764  def main(): Line 970  def main():
970          sys.exit(0)          sys.exit(0)
971    
972  if __name__ == "__main__":  if __name__ == "__main__":
973        os.environ['PYTHONUNBUFFERED'] = '1'
974      main()      main()

Legend:
Removed from v.3180  
changed lines
  Added in v.5288

  ViewVC Help
Powered by ViewVC 1.1.30