[ros-bloom] 01/03: New upstream version 0.5.23

Jochen Sprickerhof jspricke at moszumanska.debian.org
Fri Nov 4 08:48:26 UTC 2016


This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to annotated tag debian/0.5.23-1
in repository ros-bloom.

commit a4bcd02872efee2a0a4df073389dec37c9779198
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 4 09:47:20 2016 +0100

    New upstream version 0.5.23
---
 CHANGELOG.rst                     | 5 +++++
 bloom/generators/rpm/generator.py | 3 ++-
 bloom/git.py                      | 2 ++
 docs/index.rst                    | 5 +++++
 setup.py                          | 4 ++--
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6db845e..b5553ec 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+0.5.23 (2016-10-25 11:45:00 -0800)
+----------------------------------
+- Fix to support change in output with git 2.9.3.
+- Added more detailed message about skipping non-required distributions, e.g. Fedora.
+
 0.5.22 (2016-08-24 13:30:00 -0800)
 ----------------------------------
 - Repository names are now checked for bogus contents, to help detect accidental input.
diff --git a/bloom/generators/rpm/generator.py b/bloom/generators/rpm/generator.py
index 4c32daa..9ba05c0 100644
--- a/bloom/generators/rpm/generator.py
+++ b/bloom/generators/rpm/generator.py
@@ -539,7 +539,8 @@ class RpmGenerator(BloomGenerator):
 
         while not self._check_all_keys_are_valid(peer_packages):
             error("Some of the dependencies for packages in this repository could not be resolved by rosdep.")
-            error("You can try to address the issues which appear above and try again if you wish.")
+            error("You can try to address the issues which appear above and try again if you wish, "
+                  "or continue without releasing into RPM-based distributions (e.g. Fedora 24).")
             try:
                 if not maybe_continue(msg="Would you like to try again?"):
                     error("User aborted after rosdep keys were not resolved.")
diff --git a/bloom/git.py b/bloom/git.py
index 26a0677..3794446 100755
--- a/bloom/git.py
+++ b/bloom/git.py
@@ -409,6 +409,8 @@ def has_changes(directory=None):
         return False
     if 'nothing to commit, working directory clean' in out:
         return False
+    if 'nothing to commit, working tree clean' in out:
+        return False
     if 'nothing added to commit' in out:
         return False
     return True
diff --git a/docs/index.rst b/docs/index.rst
index 627a613..f1bc4c4 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -40,6 +40,11 @@ On other systems you can install bloom via pypi::
 
 Note: pip will not notify you of updates, but bloom will notify you when you are using a version of bloom that is not the latest released.
 
+Develop and build from source::
+
+    $ python setup.py build
+    $ sudo python setup.py develop
+
 How do I release something with bloom?
 ---------------------------------------
 
diff --git a/setup.py b/setup.py
index 6464595..4fbabfe 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import sys
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 install_requires = [
     'catkin-pkg >= 0.2.2',
@@ -22,7 +22,7 @@ if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
 
 setup(
     name='bloom',
-    version='0.5.22',
+    version='0.5.23',
     packages=find_packages(exclude=['test']),
     package_data={
         'bloom.generators.debian': [

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-bloom.git



More information about the debian-science-commits mailing list