Ask Your Question

Revision history [back]

bloom-release fails 'because the working directory has changes'

Taking over the maintenance of a ROS package I'm trying to release a new version of it. The package is rosparam_handler.
I think I followed the tuto ReleaseCatkinPackage properly, running a (successful) local pre-release, generating the changelog and tagging.
Now running the bloom-release rosparam_handler --track indigo --rosdistro indigo fails with
Failed to checkout to 'master' because the working directory has local changes
followed by a git status with some of the repo's files marked 'new' and other marked 'modified'.
I should mention that there are a couple clang-format complains, but the concerned files are not one-to-one matches with those that are marked as 'modified' in the git status. This makes me doubt that it is the core issue here. Can it still be clang-format that automatically does some local changes ? It finally concludes with :

Traceback (most recent call last):
  File "/usr/bin/git-bloom-import-upstream", line 11, in <module>
    load_entry_point('bloom==0.6.2', 'console_scripts', 'git-bloom-import-upstream')()
  File "/usr/lib/python2.7/dist-packages/bloom/commands/git/import_upstream.py", line 398, in main
    args.replace)
  File "/usr/lib/python2.7/dist-packages/bloom/commands/git/import_upstream.py", line 322, in import_upstream
    import_tarball(tarball_path, 'upstream', version, name)
  File "/usr/lib/python2.7/dist-packages/bloom/commands/git/import_upstream.py", line 160, in import_tarball
    execute_command(cmd)
  File "/usr/lib/python2.7/dist-packages/bloom/util.py", line 461, in execute_command
    raise CalledProcessError(result, cmd)
CalledProcessError: Command 'git commit -m "Imported upstream version '0.1.2' of 'upstream'"' returned non-zero exit status 1

<== Error running command '['/usr/bin/git-bloom-import-upstream', '/tmp/tmpNRV4Fc/rosparam_handler-0.1.2.tar.gz', '--release-version', '0.1.2', '--replace']'
Release failed, exiting.

I'd prefer to avoid fixing those clang-format issues, re-tag and try again before being fairly certain that's the issue.

bloom-release --version
0.6.2
git --version
git version 2.13.0

Any idea ?

Thanks.

bloom-release fails 'because the working directory has changes'

Taking over the maintenance of a ROS package I'm trying to release a new version of it. The package is rosparam_handler.
I think I followed the tuto ReleaseCatkinPackage properly, running a (successful) local pre-release, generating the changelog and tagging.
Now running the bloom-release rosparam_handler --track indigo --rosdistro indigo fails with
Failed to checkout to 'master' because the working directory has local changes
followed by a git status with some of the repo's files marked 'new' and other marked 'modified'.
I should mention that there are a couple clang-format complains, but the concerned files are not one-to-one matches with those that are marked as 'modified' in the git status. This makes me doubt that it is the core issue here. Can it still be clang-format that automatically does some local changes ? It finally concludes with :

Traceback (most recent call last):
  File "/usr/bin/git-bloom-import-upstream", line 11, in <module>
    load_entry_point('bloom==0.6.2', 'console_scripts', 'git-bloom-import-upstream')()
  File "/usr/lib/python2.7/dist-packages/bloom/commands/git/import_upstream.py", line 398, in main
    args.replace)
  File "/usr/lib/python2.7/dist-packages/bloom/commands/git/import_upstream.py", line 322, in import_upstream
    import_tarball(tarball_path, 'upstream', version, name)
  File "/usr/lib/python2.7/dist-packages/bloom/commands/git/import_upstream.py", line 160, in import_tarball
    execute_command(cmd)
  File "/usr/lib/python2.7/dist-packages/bloom/util.py", line 461, in execute_command
    raise CalledProcessError(result, cmd)
CalledProcessError: Command 'git commit -m "Imported upstream version '0.1.2' of 'upstream'"' returned non-zero exit status 1

<== Error running command '['/usr/bin/git-bloom-import-upstream', '/tmp/tmpNRV4Fc/rosparam_handler-0.1.2.tar.gz', '--release-version', '0.1.2', '--replace']'
Release failed, exiting.

I'd prefer to avoid fixing those clang-format issues, re-tag and try again before being fairly certain that's the issue.

bloom-release --version
0.6.2
git --version
git version 2.13.0

Any idea ?

Thanks.

Edit

I could release the package on a different machine with Ubuntu 14 and bloom 0.5.23.