/[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 3057 by ovitters, Sat Feb 25 19:58:52 2012 UTC revision 3568 by ovitters, Mon Mar 19 14:26:13 2012 UTC
# Line 1  Line 1 
1  #!/usr/bin/python  #!/usr/bin/python -u
2    
3  # A lot of the code comes from ftpadmin, see  # A lot of the code comes from ftpadmin, see
4  #   http://git.gnome.org/browse/sysadmin-bin/tree/ftpadmin  #   http://git.gnome.org/browse/sysadmin-bin/tree/ftpadmin
# Line 33  from sgmllib import SGMLParser Line 33  from sgmllib import SGMLParser
33  import urllib2  import urllib2
34  import urlparse  import urlparse
35    
36    # for checking hashes
37    import hashlib
38    
39    # for parsing ftp-release-list emails
40    import email
41    from email.mime.text import MIMEText
42    
43    # to be able to sleep for a while
44    import time
45    
46    # version freeze
47    import datetime
48    
49  MEDIA="Core Release Source"  MEDIA="Core Release Source"
50  URL="http://download.gnome.org/sources/"  URL="http://download.gnome.org/sources/"
51  PKGROOT='~/pkgs'  PKGROOT='~/pkgs'
52    SLEEP_INITIAL=180
53    SLEEP_REPEAT=30
54    SLEEP_TIMES=20
55    
56    re_majmin = re.compile(r'^([0-9]+\.[0-9]+).*')
57  re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')  re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')
58    
59  def version_cmp(a, b):  def version_cmp(a, b):
# Line 62  def get_latest_version(versions, max_ver Line 79  def get_latest_version(versions, max_ver
79              latest = version              latest = version
80      return latest      return latest
81    
82    def judge_version_increase(version_old, version_new):
83            """Judge quality of version increase:
84    
85            Returns a tuple containing judgement and message
86    
87            Judgement:
88            Less than 0: Error
89            0 to 4: Better not
90            5+: Ok"""
91            versions = (version_old, version_new)
92    
93            # First do a basic version comparison to ensure version_new is actually newer
94            compare = version_cmp(version_new, version_old)
95    
96            if compare == 0:
97                # 1.0.0 -> 1.0.1
98                return (-2, "Already at version %s!" % (version_old))
99    
100            if compare != 1:
101                # 1.0.1 -> 1.0.0
102                return (-3, "Version %s is older than current version %s!" % (version_new, version_old))
103    
104            # Version is newer, but we don't want to see if it follows the GNOME versioning scheme
105            majmins = [re_majmin.sub(r'\1', ver) for ver in versions if re_majmin.match(ver) is not None]
106    
107            if len(majmins) == 1:
108                return (-1, "Version number scheme changes: %s" % (", ".join(versions)))
109    
110            if len(majmins) == 0:
111                return (0, "Unsupported version numbers: %s" % (", ".join(versions)))
112    
113            # Follows GNOME versioning scheme
114            # Meaning: x.y.z
115            #          x = major
116            #          y = minor  : even if stable
117            #          z = micro
118    
119            # Major+minor the same? Then go ahead and upgrade!
120            if majmins[0] == majmins[1]:
121                # Majmin of both versions are the same, looks good!
122                # 1.1.x -> 1.1.x or 1.0.x -> 1.0.x
123                return (10, None)
124    
125            # More detailed analysis needed, so figure out the numbers
126            majmin_nrs = [map(long, ver.split('.')) for ver in majmins]
127    
128            # Check/ensure major version number is the same
129            if majmin_nrs[0][0] != majmin_nrs[1][0]:
130                # 1.0.x -> 2.0.x
131                return (1, "Major version number increase")
132    
133            # Minor indicates stable/unstable
134            devstate = (majmin_nrs[0][1] % 2 == 0, majmin_nrs[1][1] % 2 == 0)
135    
136            # Upgrading to unstable is weird
137            if not devstate[1]:
138                if devstate[0]:
139                    # 1.2.x -> 1.3.x
140                    return (1, "Stable to unstable increase")
141    
142                # 1.3.x -> 1.5.x
143                return (4, "Unstable to unstable version increase")
144    
145            # Unstable => stable is always ok
146            if not devstate[0]:
147                # 1.1.x -> 1.2.x
148                return (5, "Unstable to stable")
149    
150            # Can only be increase of minors from one stable to the next
151            # 1.0.x -> 1.2.x
152            return (6, "Stable version increase")
153    
154  def line_input (file):  def line_input (file):
155      for line in file:      for line in file:
156          if line[-1] == '\n':          if line[-1] == '\n':
# Line 134  class XzTarFile(tarfile.TarFile): Line 223  class XzTarFile(tarfile.TarFile):
223          t._extfileobj = False          t._extfileobj = False
224          return t          return t
225    
226  if not hasattr(tarfile.TarFile, 'xvopen'):  if not hasattr(tarfile.TarFile, 'xzopen'):
227      tarfile.open = XzTarFile.open      tarfile.open = XzTarFile.open
228    
229    def is_valid_hash(path, algo, hexdigest):
230        if algo not in hashlib.algorithms:
231            raise ValueError("Unknown hash algorithm: %s" % algo)
232    
233        local_hash = getattr(hashlib, algo)()
234    
235        with open(path, 'rb') as fp:
236            data = fp.read(32768)
237            while data:
238                local_hash.update(data)
239                data = fp.read(32768)
240    
241        return local_hash.hexdigest() == hexdigest
242    
243  class SpecFile(object):  class SpecFile(object):
244      re_update_version = re.compile(r'^(?P<pre>Version:\s*)(?P<version>.+)(?P<post>\s*)$', re.MULTILINE + re.IGNORECASE)      re_update_version = re.compile(r'^(?P<pre>Version:\s*)(?P<version>.+)(?P<post>\s*)$', re.MULTILINE + re.IGNORECASE)
245      re_update_release = re.compile(r'^(?P<pre>Release:\s*)(?P<release>%mkrel \d+)(?P<post>\s*)$', re.MULTILINE + re.IGNORECASE)      re_update_release = re.compile(r'^(?P<pre>Release:\s*)(?P<release>%mkrel \d+)(?P<post>\s*)$', re.MULTILINE + re.IGNORECASE)
# Line 148  class SpecFile(object): Line 251  class SpecFile(object):
251      @property      @property
252      def version(self):      def version(self):
253          return subprocess.check_output(["rpm", "--specfile", self.path, "--queryformat", "%{VERSION}\n"]).splitlines()[0]          return subprocess.check_output(["rpm", "--specfile", self.path, "--queryformat", "%{VERSION}\n"]).splitlines()[0]
254        @property
255        def sources(self):
256            ts = rpm.ts()
257            spec = ts.parseSpec(self.path)
258            srclist = spec.sources if isinstance(spec.sources, (list, tuple)) \
259                            else spec.sources()
260            return dict((os.path.basename(name), name) for name, no, flags in srclist)
261    
262      def update(self, version):      def update(self, version, force=False):
263          """Update specfile (increase version)"""          """Update specfile (increase version)"""
264          cur_version = self.version          cur_version = self.version
265    
266          compare = version_cmp(version, cur_version)          (judgement, msg) = judge_version_increase(cur_version, version)
267    
268          if compare == 0:          if judgement < 0:
269              print >>sys.stderr, "ERROR: Already at version %s!" % (cur_version)              print >>sys.stderr, "ERROR: %s!" % (msg)
270              return False              return False
271    
272          if compare != 1:          if judgement < 5:
273              print >>sys.stderr, "ERROR: Version %s is older than current version %s!" % (version, cur_version)              print "WARNING: %s!" % (msg)
274              return False              if not force: return False
275    
276          # XXX - os.path.join is hackish          # XXX - os.path.join is hackish
277          if subprocess.check_output(["svn", "diff", os.path.join(self.path, '..')]) != '':          svn_diff_output = subprocess.check_output(["svn", "diff", os.path.join(self.path, '..')])
278            if svn_diff_output != '':
279                print svn_diff_output
280              print >>sys.stderr, "ERROR: Package has uncommitted changes!"              print >>sys.stderr, "ERROR: Package has uncommitted changes!"
281              return False              if not force:
282                    return False
283    
284                # Forcing package submission: revert changes
285                try:
286                    print >>sys.stderr, "WARNING: Force used; reverting svn changes"
287                    subprocess.check_call(["svn", "revert", "-R", os.path.join(self.path, '..')])
288                except subprocess.CalledProcessError:
289                    return False
290    
291          with open(self.path, "rw") as f:          with open(self.path, "rw") as f:
292              data = f.read()              data = f.read()
# Line 194  class SpecFile(object): Line 314  class SpecFile(object):
314              print "ERROR: Increased version to %s, but RPM doesn't agree!?!" % version              print "ERROR: Increased version to %s, but RPM doesn't agree!?!" % version
315              return False              return False
316    
317    
318            # Try to download the new tarball various times and wait between attempts
319            tries = 0
320            while tries < SLEEP_TIMES:
321                tries += 1
322                if tries > 1: time.sleep(SLEEP_REPEAT)
323                try:
324                    # Download new tarball
325                    subprocess.check_call(['mgarepo', 'sync', '-d'], cwd=self.cwd)
326                    # success, so exit loop
327                    break
328                except subprocess.CalledProcessError, e:
329                    # mgarepo sync returns 1 if the tarball cannot be downloaded
330                    if e.returncode != 1:
331                        return False
332            else:
333                return False
334    
335    
336          try:          try:
             # Download new tarball  
             subprocess.check_call(['mgarepo', 'sync', '-d'], cwd=self.cwd)  
337              # Check patches still apply              # Check patches still apply
338              subprocess.check_call(['bm', '-p', '--nodeps'], cwd=self.cwd)              subprocess.check_call(['bm', '-p', '--nodeps'], cwd=self.cwd)
339          except subprocess.CalledProcessError:          except subprocess.CalledProcessError:
340                logfile = os.path.join(os.path.dirname(self.path), 'log.%s' % os.path.splitext(os.path.basename(self.path))[0])
341                if os.path.exists(logfile)
342                    subprocess.call(['tail', '-n', '15', logfile])
343              return False              return False
344    
345          return True          return True
# Line 326  class Patch(object): Line 466  class Patch(object):
466      @property      @property
467      def svn_author(self):      def svn_author(self):
468          if not hasattr(self, '_svn_author'):          if not hasattr(self, '_svn_author'):
469              p = subprocess.Popen(['svn', 'log', '-q', "--", self.path], stdout=subprocess.PIPE, close_fds=True)              try:
470              contents = p.stdout.read().strip("\n").splitlines()                  contents = subprocess.check_output(['svn', 'log', '-q', "--", self.path], close_fds=True).strip("\n").splitlines()
471              ecode = p.wait()  
             if ecode == 0:  
472                  for line in contents:                  for line in contents:
473                      if ' | ' not in line:                      if ' | ' not in line:
474                          continue                          continue
# Line 337  class Patch(object): Line 476  class Patch(object):
476                      fields = line.split(' | ')                      fields = line.split(' | ')
477                      if len(fields) >= 3:                      if len(fields) >= 3:
478                          self._svn_author = fields[1]                          self._svn_author = fields[1]
479                except subprocess.CalledProcessError:
480                    pass
481    
482          if not hasattr(self, '_svn_author'):          if not hasattr(self, '_svn_author'):
483              return None              return None
# Line 363  def get_upstream_names(): Line 504  def get_upstream_names():
504  def get_downstream_names():  def get_downstream_names():
505      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]*)$')
506    
507      p = subprocess.Popen(['urpmf', '--files', '.', "--media", MEDIA], stdout=subprocess.PIPE, close_fds=True)      contents = subprocess.check_output(['urpmf', '--qf', '%name|%version|%files', '.', "--media", MEDIA], close_fds=True).strip("\n").splitlines()
     contents = p.stdout.read().strip("\n").splitlines()  
     ecode = p.wait()  
     if ecode != 0:  
         sys.exit(1)  
508    
509      FILES = {}      FILES = {}
510      TARBALLS = {}      TARBALLS = {}
511    
512      for line in  contents:      for line in  contents:
513          try:          try:
514              srpm, filename = line.split(":")              srpm, version, filename = line.split("|")
515          except ValueError:          except ValueError:
516              print >>sys.stderr, line              print >>sys.stderr, line
517              continue              continue
# Line 386  def get_downstream_names(): Line 523  def get_downstream_names():
523                  module = fileinfo['module']                  module = fileinfo['module']
524    
525                  if module not in TARBALLS:                  if module not in TARBALLS:
526                      TARBALLS[module] = set()                      TARBALLS[module] = {}
527                  TARBALLS[module].add(srpm)                  TARBALLS[module][srpm] = version
528    
529          if srpm not in FILES:          if srpm not in FILES:
530              FILES[srpm] = set()              FILES[srpm] = set()
# Line 395  def get_downstream_names(): Line 532  def get_downstream_names():
532    
533      return TARBALLS, FILES      return TARBALLS, FILES
534    
535    def get_downstream_from_upstream(upstream, version):
536        # Determine the package name
537        downstream, downstream_files = get_downstream_names()
538    
539        if upstream not in downstream:
540            raise ValueError("No packages for upstream name: %s" % upstream)
541    
542        if len(downstream[upstream]) == 1:
543            return downstream[upstream].keys()
544    
545        # Directories packages are located in
546        root = os.path.expanduser(PKGROOT)
547    
548        packages = {}
549        for package in downstream[upstream].keys():
550            cwd = os.path.join(root, package)
551    
552            # Checkout package to ensure the checkout reflects the latest changes
553            try:
554                subprocess.check_call(['mgarepo', 'co', package], cwd=root)
555            except subprocess.CalledProcessError:
556                raise ValueError("Multiple packages found and cannot checkout %s" % package)
557    
558            # Determine version from spec file
559            try:
560                packages[package] = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version
561            except subprocess.CalledProcessError:
562                raise ValueError("Multiple packages found and cannot determine version of %s" % package)
563    
564        # Return all packages reflecting the current version
565        matches = [package for package in packages if packages[package] == version]
566        if len(matches):
567            return matches
568    
569        # Return all packages reflecting the version before the current version
570        latest_version = get_latest_version(packages.values(), max_version=version)
571        matches = [package for package in packages if packages[package] == latest_version]
572        if len(matches):
573            return matches
574    
575        # Give up
576        raise ValueError("Multiple packages found and cannot determine package for version %s" % version)
577    
578  def write_file(path, data):  def write_file(path, data):
579      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 403  def write_file(path, data): Line 582  def write_file(path, data):
582          os.rename(fdst.name, path)          os.rename(fdst.name, path)
583    
584  def cmd_co(options, parser):  def cmd_co(options, parser):
585      upstream = get_upstream_names()      root = os.path.expanduser(PKGROOT)
     downstream, downstream_files = get_downstream_names()  
586    
587      cwd = os.path.expanduser(PKGROOT)      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):
588            print "%s => %s" % (module, package)
589            subprocess.call(['mgarepo', 'co', package], cwd=root)
590    
591      matches = upstream & set(downstream.keys())  def join_streams(show_version=False, only_diff_version=False):
592      for module in matches:      root = os.path.expanduser(PKGROOT)
         print module, "\t".join(downstream[module])  
         for package in downstream[module]:  
             subprocess.call(['mgarepo', 'co', package], cwd=cwd)  
593    
 def cmd_ls(options, parser):  
594      upstream = get_upstream_names()      upstream = get_upstream_names()
595      downstream, downstream_files = get_downstream_names()      downstream, downstream_files = get_downstream_names()
596    
597      matches = upstream & set(downstream.keys())      matches = upstream & set(downstream.keys())
598      for module in matches:      for module in matches:
599          print "\n".join(downstream[module])          for package in downstream[module].keys():
600                package_version = downstream[module][package]
601                spec_version = None
602                if show_version or only_diff_version:
603                    cwd = os.path.join(root, package)
604                    try:
605                        spec_version = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package)).version
606                    except subprocess.CalledProcessError:
607                        spec_version = 'N/A'
608    
609  def cmd_patches(options, parser):              if only_diff_version and package_version == spec_version:
610      upstream = get_upstream_names()                  continue
     downstream, downstream_files = get_downstream_names()  
611    
612      path = os.path.expanduser(PKGROOT)              yield (package, module, package_version, spec_version, downstream_files[package])
613    
614      import pprint  def cmd_ls(options, parser):
615        for package, module, package_version, spec_version, downstream_files in sorted(join_streams(show_version=options.show_version, only_diff_version=options.diff)):
616            print package,"\t",
617            if options.upstream: print module, "\t",
618            if options.show_version: print spec_version, "\t", package_version, "\t",
619            print
620    
621      matches = upstream & set(downstream.keys())  def cmd_patches(options, parser):
622      for module in sorted(matches):      root = os.path.expanduser(PKGROOT)
623          for srpm in downstream[module]:  
624              for filename in downstream_files[srpm]:      for package, module, package_version, spec_version, downstream_files in sorted(join_streams()):
625                  if '.patch' in filename or '.diff' in filename:          for filename in downstream_files:
626                if '.patch' in filename or '.diff' in filename:
627                      p = Patch(os.path.join(path, srpm, "SOURCES", filename), show_path=options.path)  
628                      valid = ""                  p = Patch(os.path.join(root, package, "SOURCES", filename), show_path=options.path)
629                      forwarded = ""                  valid = ""
630                      if p.dep3['headers']:                  forwarded = ""
631                          forwarded = p.dep3['headers'].get('Forwarded', "no")                  if p.dep3['headers']:
632                          if p.dep3['valid']:                      forwarded = p.dep3['headers'].get('Forwarded', "no")
633                              valid="VALID"                      if p.dep3['valid']:
634                      print "\t".join((module, srpm, str(p), forwarded, valid))                          valid="VALID"
635                    print "\t".join((module, package, str(p), forwarded, valid))
636    
637  def cmd_dep3(options, parser):  def cmd_dep3(options, parser):
638      p = Patch(options.patch)      p = Patch(options.patch)
639      p.add_dep3()      p.add_dep3()
640    
641  def cmd_package_new_version(options, parser):  def cmd_package_new_version(options, parser):
642      package = options.package      # Determine the package name
643        if options.upstream:
644            try:
645                package = get_downstream_from_upstream(options.package, options.version)[0]
646            except ValueError, e:
647                print >>sys.stderr, "ERROR: %s" % e
648                sys.exit(1)
649        else:
650            package = options.package
651    
652        # Directories packages are located in
653      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(PKGROOT)
654      cwd = os.path.join(root, package)      cwd = os.path.join(root, package)
655    
656        # Checkout package to ensure the checkout reflects the latest changes
657      try:      try:
658          subprocess.check_call(['mgarepo', 'co', package], cwd=root)          subprocess.check_call(['mgarepo', 'co', package], cwd=root)
659      except subprocess.CalledProcessError:      except subprocess.CalledProcessError:
660          sys.exit(1)          sys.exit(1)
661    
662        # SpecFile class handles the actual version+release change
663      s = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package))      s = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package))
664      print "%s => %s" % (s.version, options.version)      print "%s => %s" % (s.version, options.version)
665      if not s.update(options.version):      if not s.update(options.version, force=options.force):
666          sys.exit(1)          sys.exit(1)
667    
668        # Check hash, if given
669        if options.hexdigest is not None:
670            sources = [name for name, origname in s.sources.iteritems() if '://' in origname]
671            if not len(sources):
672                print >>sys.stderr, "ERROR: Cannot determine source file (for hash check)!"
673                sys.stderr(1)
674    
675            for filename in sources:
676                if not is_valid_hash(os.path.join(cwd, "SOURCES", filename), options.algo, options.hexdigest):
677                    print >>sys.stderr, "ERROR: Hash file failed check for %s!" % path
678                    print >>sys.stderr, "ERROR: Reverting changes!"
679                    subprocess.call(['svn', 'revert', '-R', cwd], cwd=cwd)
680                    sys.exit(1)
681    
682        # We can even checkin and submit :-)
683      if options.submit:      if options.submit:
684          try:          try:
685              # checkin changes              # checkin changes
686              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version'], cwd=cwd)              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)
687              # and submit              # and submit
688              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)
689          except subprocess.CalledProcessError:          except subprocess.CalledProcessError:
690              sys.exit(1)              sys.exit(1)
691    
692    def cmd_parse_ftp_release_list(options, parser):
693        def _send_reply_mail(contents, orig_msg, to, error=False):
694            """Send an reply email"""
695            contents.seek(0)
696            msg = MIMEText(contents.read(), _charset='utf-8')
697            if error:
698                # XXX - ugly
699                contents.seek(0)
700                lastline = contents.read().rstrip().splitlines()[-1]
701                # Remove things like "ERROR: " and so on from the last line
702                lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline)
703                subjecterror = " (ERROR: %s)" % lastline if lastline else " (ERROR)"
704            else:
705                subjecterror = ""
706            msg['Subject'] = "Re: %s%s" % (orig_msg['Subject'], subjecterror)
707            msg['To'] = to
708            msg["In-Reply-To"] = orig_msg["Message-ID"]
709            msg["References"] = orig_msg["Message-ID"]
710    
711            # Call sendmail program directly so it doesn't matter if the service is running
712            cmd = ['/usr/sbin/sendmail', '-oi', '--']
713            cmd.extend([to])
714            p = subprocess.Popen(cmd, stdin=subprocess.PIPE)
715            p.stdin.write(msg.as_string())
716            p.stdin.flush()
717            p.stdin.close()
718            p.wait()
719    
720    
721        msg = email.email.message_from_file(sys.stdin)
722    
723        if options.mail:
724            stdout = tempfile.TemporaryFile()
725            stderr = stdout
726        else:
727            stdout = sys.stdout
728            stderr = sys.stderr
729    
730        try:
731            module = msg['X-Module-Name']
732            version = msg['X-Module-Version']
733            hexdigest = msg['X-Module-SHA256-tar.xz']
734        except KeyError, e:
735            print >>stderr, "ERROR: %s" % e
736            if options.mail: _send_reply_mail(stdout, msg, options.mail, error=True)
737            sys.exit(1)
738    
739        try:
740            packages = get_downstream_from_upstream(module, version)
741        except ValueError, e:
742            print >>stderr, "ERROR: %s" % e
743            if options.mail: _send_reply_mail(stdout, msg, options.mail, error=True)
744            sys.exit(1)
745    
746        if options.wait:
747            # maildrop aborts and will try to deliver after 5min
748            # fork to avoid this
749            if os.fork() != 0: sys.exit(0)
750            # wait SLEEP_INITIAL after the message was sent
751            secs = SLEEP_INITIAL
752            t = email.utils.parsedate_tz(msg['Date'])
753            if t is not None:
754                msg_time = email.utils.mktime_tz(t)
755                secs = SLEEP_INITIAL - (time.time() - msg_time)
756    
757            if secs > 0: time.sleep(secs)
758    
759        error = False
760        for package in packages:
761            cmd = ['mga-gnome', 'increase', '--submit', '--hash', hexdigest]
762            if options.force:
763                cmd.append('--force')
764            cmd.extend((package, version))
765            if subprocess.call(cmd, stdout=stdout, stderr=stderr):
766                error = True
767    
768        if options.mail: _send_reply_mail(stdout, msg, options.mail, error=error)
769    
770  def main():  def main():
771      description = """Mageia GNOME commands."""      description = """Mageia GNOME commands."""
# Line 488  def main(): Line 781  def main():
781      )      )
782    
783      subparser = subparsers.add_parser('packages', help='list all GNOME packages')      subparser = subparsers.add_parser('packages', help='list all GNOME packages')
784        subparser.add_argument("-m", "--m", action="store_true", dest="upstream",
785                                           help="Show upstream module")
786        subparser.add_argument(      "--version", action="store_true", dest="show_version",
787                                           help="Show version numbers")
788        subparser.add_argument(      "--diff", action="store_true", dest="diff",
789                                           help="Only show packages with different version")
790      subparser.set_defaults(      subparser.set_defaults(
791          func=cmd_ls          func=cmd_ls, upstream=False, show_version=False, diff=False
792      )      )
793    
794      subparser = subparsers.add_parser('patches', help='list all GNOME patches')      subparser = subparsers.add_parser('patches', help='list all GNOME patches')
# Line 508  def main(): Line 807  def main():
807      subparser = subparsers.add_parser('increase', help='Increase version number')      subparser = subparsers.add_parser('increase', help='Increase version number')
808      subparser.add_argument("package", help="Package name")      subparser.add_argument("package", help="Package name")
809      subparser.add_argument("version", help="Version number")      subparser.add_argument("version", help="Version number")
810        subparser.add_argument("-f", "--force", action="store_true", dest="force",
811                                           help="Override warnings, just do it")
812        subparser.add_argument("-u", "--upstream", action="store_true", dest="upstream",
813                                           help="Package name reflects the upstream name")
814      subparser.add_argument("-s", "--submit", action="store_true", dest="submit",      subparser.add_argument("-s", "--submit", action="store_true", dest="submit",
815                                         help="Commit changes and submit")                                         help="Commit changes and submit")
816        subparser.add_argument("-a", "--algorithm", choices=hashlib.algorithms, dest="algo",
817                                           help="Hash algorithm")
818        subparser.add_argument("--hash", dest="hexdigest",
819                                           help="Hexdigest of the hash")
820        subparser.set_defaults(
821            func=cmd_package_new_version, submit=False, upstream=False, hexdigest=None, algo="sha256",
822            force=False
823        )
824    
825        subparser = subparsers.add_parser('gnome-release-email', help='Submit packages based on GNOME ftp-release-list email')
826        subparser.add_argument("-m", "--mail", help="Email address to send the progress to")
827        subparser.add_argument("-w", "--wait", action="store_true",
828                                     help="Wait before trying to retrieve the new version")
829        subparser.add_argument("-f", "--force", action="store_true",
830                                     help="Force submission")
831      subparser.set_defaults(      subparser.set_defaults(
832          func=cmd_package_new_version, submit=False          func=cmd_parse_ftp_release_list, force=False, wait=False
833      )      )
834    
835      if len(sys.argv) == 1:      if len(sys.argv) == 1:
# Line 534  def main(): Line 852  def main():
852          sys.exit(0)          sys.exit(0)
853    
854  if __name__ == "__main__":  if __name__ == "__main__":
855        os.environ['PYTHONUNBUFFERED'] = '1'
856      main()      main()
Legend:
Removed from v.3057  
changed lines
  Added in v.3568
  ViewVC Help
Powered by ViewVC 1.1.30