merge upcoming 3.3 and 3.2.2
authorDavid Douard <david.douard@logilab.fr>
Fri, 29 May 2015 11:27:00 +0200
changeset 1819 21c020c077a5
parent 1818 b99983186da6 (current diff)
parent 1794 d9ec494e52ec (diff)
child 1820 c36a1a0ad3e8
merge upcoming 3.3 and 3.2.2
__pkginfo__.py
debian/changelog
--- a/__pkginfo__.py	Thu May 21 18:08:58 2015 +0200
+++ b/__pkginfo__.py	Fri May 29 11:27:00 2015 +0200
@@ -4,7 +4,7 @@
 modname = 'apycotlib'
 distname = 'apycot'
 
-numversion = (3, 2, 2)
+numversion = (3, 3, 0)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'GPL'
--- a/_narval/checkers/apycot/lgp.py	Thu May 21 18:08:58 2015 +0200
+++ b/_narval/checkers/apycot/lgp.py	Fri May 29 11:27:00 2015 +0200
@@ -91,7 +91,7 @@
                     '\n'.join(list(log_file))))
 
     def do_check(self, test):
-        dist = self.options.get('lgp_build_distrib') or ['all']
+        dist = self.options.get('lgp_build_distrib')
         sign = self.options.get('lgp_sign')
         suffix = self.options.get('lgp_suffix')
         build_folder = os.path.join(test.project_path(), '..')
@@ -102,11 +102,14 @@
             handler = LgpLogHandler(self.writer)
             cmd = LGP.get_command(self.command)
             cmd.logger.addHandler(handler)
-            args = ['-v', '-s', sign, '-d', ','.join(dist), '-r', build_folder ]
+            args = ['-v', '-s', sign, '-r', build_folder]
+            if dist:
+                args += ['-d', ','.join(dist)]
             if suffix:
                 args += ['--suffix', '~rev%s' % repo.revision()]
             exit_status = cmd.main_run(args, LGP.rcfile)
             self.debian_changes = [f for f in cmd.packages if f.endswith('.changes')]
+            self.rpms = [f for f in cmd.packages if f.endswith('.rpm')]
             if exit_status:
                 self.writer.fatal('lgp %s exited with status %s', self.command, exit_status)
                 self.set_status(apycot.ERROR)
--- a/debian/changelog	Thu May 21 18:08:58 2015 +0200
+++ b/debian/changelog	Fri May 29 11:27:00 2015 +0200
@@ -1,3 +1,9 @@
+apycot (3.3.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Julien Cristau <julien.cristau@logilab.fr>  Fri, 20 Mar 2015 16:35:29 +0100
+
 apycot (3.2.2-1) unstable; urgency=medium
 
   * new upstream release