Skip to content

Commit

Permalink
Fixed a bug with the release generator
Browse files Browse the repository at this point in the history
non-catkin projects cannot update the release tag
without the version...
  • Loading branch information
wjwwood committed Oct 25, 2012
1 parent 26ce095 commit 86ddda5
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions bloom/generators/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from bloom.git import get_current_branch

from bloom.logging import info
from bloom.logging import warning

from bloom.util import code
from bloom.util import execute_command
Expand Down Expand Up @@ -79,6 +80,11 @@ def post_rebase(self, destination):

def post_patch(self, destination):
# Figure out the version of the given package
if self.name is not None:
warning("Cannot automatically tag the release because this is "
"not a catkin project. Please create a tag manually with:")
warning(" git tag -f release/" + str(self.name) + "/<version>")
return 0
with inbranch(destination):
package_data = get_package_data(destination)
if type(package_data) not in [list, tuple]:
Expand All @@ -89,8 +95,10 @@ def post_patch(self, destination):
return 0

def detect_branches(self):
self.packages = None
with inbranch(self.src):
if self.name is not None:
self.packages = [self.name]
return [self.name]
package_data = get_package_data(self.src)
if type(package_data) not in [list, tuple]:
Expand Down

0 comments on commit 86ddda5

Please sign in to comment.