search

ros-infrastructure / bloom

A release automation tool which makes releasing catkin (http://ros.org/wiki/catkin) packages easier.
Other
58 stars 95 forks source link

bloom still re-generates deb branch for deleted package in a multi-package repository #197

Closed piyushk closed 10 years ago

piyushk commented 11 years ago

I removed one of the packages (segbot_gazebo_plugins) from a multi-package repository. On the next release (0.1.3), bloom still attempt to re-create the debian branch for segbot_gazebo_plugins (0.1.2). The final pull request for updating release.yaml was fine and removed segbot_gazebo_plugins.

==> git-bloom-generate -y rosrelease hydro --source upstream -i 0
Releasing packages: ['segbot_gazebo', 'segbot_simulator']
Releasing package 'segbot_gazebo' for 'hydro' to: 'release/hydro/segbot_gazebo'
Releasing package 'segbot_simulator' for 'hydro' to: 'release/hydro/segbot_simulator'

==> git-bloom-generate -y rosdebian --prefix release/hydro hydro -i 0
Generating source debs for the packages: ['segbot_simulator', 'segbot_gazebo', 'segbot_gazebo_plugins']
Debian Incremental Version: 0
Debian Distributions: ['precise', 'quantal', 'raring']
Releasing for rosdistro: hydro
Placing debian template files into 'debian/hydro/segbot_simulator' branch.

...and...

Placing debian template files into 'debian/hydro/segbot_gazebo_plugins' branch.
==> Placing templates files in the 'debian' folder.

####
#### Generating 'precise' debian for package 'segbot_gazebo_plugins' at version '0.1.2-0'
####
Generating debian for precise...
Package 'segbot-gazebo-plugins' has dependencies:
Run Dependencies:
  rosdep key           => precise key
  cv_bridge            => ['ros-hydro-cv-bridge']
  gazebo               => ['gazebo']
  gazebo_ros           => ['ros-hydro-gazebo-ros']
  image_transport      => ['ros-hydro-image-transport']
  message_runtime      => ['ros-hydro-message-runtime']
  roscpp               => ['ros-hydro-roscpp']
Build and Build Tool Dependencies:
  rosdep key           => precise key
  cv_bridge            => ['ros-hydro-cv-bridge']
  gazebo               => ['gazebo']
  gazebo_ros           => ['ros-hydro-gazebo-ros']
  image_transport      => ['ros-hydro-image-transport']
  message_generation   => ['ros-hydro-message-generation']
  roscpp               => ['ros-hydro-roscpp']
  catkin               => ['ros-hydro-catkin']
==> In place processing templates in 'debian' folder.
Expanding 'debian/changelog.em' -> 'debian/changelog'
Expanding 'debian/gbp.conf.em' -> 'debian/gbp.conf'
Expanding 'debian/rules.em' -> 'debian/rules'
Expanding 'debian/control.em' -> 'debian/control'
Overwriting tag: debian/ros-hydro-segbot-gazebo-plugins_0.1.2-0_precise
####
#### Successfully generated 'precise' debian for package 'segbot_gazebo_plugins' at version '0.1.2-0'
####

####
#### Generating 'quantal' debian for package 'segbot_gazebo_plugins' at version '0.1.2-0'
####
Generating debian for quantal...
Package 'segbot-gazebo-plugins' has dependencies:
Run Dependencies:
  rosdep key           => quantal key
  cv_bridge            => ['ros-hydro-cv-bridge']
  gazebo               => ['gazebo']
  gazebo_ros           => ['ros-hydro-gazebo-ros']
  image_transport      => ['ros-hydro-image-transport']
  message_runtime      => ['ros-hydro-message-runtime']
  roscpp               => ['ros-hydro-roscpp']
Build and Build Tool Dependencies:
  rosdep key           => quantal key
  cv_bridge            => ['ros-hydro-cv-bridge']
  gazebo               => ['gazebo']
  gazebo_ros           => ['ros-hydro-gazebo-ros']
  image_transport      => ['ros-hydro-image-transport']
  message_generation   => ['ros-hydro-message-generation']
  roscpp               => ['ros-hydro-roscpp']
  catkin               => ['ros-hydro-catkin']
==> In place processing templates in 'debian' folder.
Expanding 'debian/changelog.em' -> 'debian/changelog'
Expanding 'debian/gbp.conf.em' -> 'debian/gbp.conf'
Expanding 'debian/rules.em' -> 'debian/rules'
Expanding 'debian/control.em' -> 'debian/control'
Overwriting tag: debian/ros-hydro-segbot-gazebo-plugins_0.1.2-0_quantal
####
#### Successfully generated 'quantal' debian for package 'segbot_gazebo_plugins' at version '0.1.2-0'
####

####
#### Generating 'raring' debian for package 'segbot_gazebo_plugins' at version '0.1.2-0'
####
Generating debian for raring...
Package 'segbot-gazebo-plugins' has dependencies:
Run Dependencies:
  rosdep key           => raring key
  cv_bridge            => ['ros-hydro-cv-bridge']
  gazebo               => ['gazebo']
  gazebo_ros           => ['ros-hydro-gazebo-ros']
  image_transport      => ['ros-hydro-image-transport']
  message_runtime      => ['ros-hydro-message-runtime']
  roscpp               => ['ros-hydro-roscpp']
Build and Build Tool Dependencies:
  rosdep key           => raring key
  cv_bridge            => ['ros-hydro-cv-bridge']
  gazebo               => ['gazebo']
  gazebo_ros           => ['ros-hydro-gazebo-ros']
  image_transport      => ['ros-hydro-image-transport']
  message_generation   => ['ros-hydro-message-generation']
  roscpp               => ['ros-hydro-roscpp']
  catkin               => ['ros-hydro-catkin']
==> In place processing templates in 'debian' folder.
Expanding 'debian/changelog.em' -> 'debian/changelog'
Expanding 'debian/gbp.conf.em' -> 'debian/gbp.conf'
Expanding 'debian/rules.em' -> 'debian/rules'
Expanding 'debian/control.em' -> 'debian/control'
Overwriting tag: debian/ros-hydro-segbot-gazebo-plugins_0.1.2-0_raring

Final pull request:

   segbot_simulator:
     packages:
       segbot_gazebo:
-      segbot_gazebo_plugins:
       segbot_simulator:
     status: developed
     tags:
       release: release/hydro/{package}/{version}
     url: https://github.com/utexas-bwi-gbp/segbot_simulator-release.git
-    version: 0.1.2-0
+    version: 0.1.3-0
   segway_rmp:
     status: maintained
     tags:
wjwwood commented 11 years ago

Yeah, this is because of this line:

git-bloom-generate -y rosdebian --prefix release/hydro hydro -i 0

That matches any existing branches with the release/hydro prefix, so any previously bloomed packages will get picked up. I should instead pass the explicit white list to the git-bloom-generate rosdebian command.

wjwwood commented 10 years ago

I cannot fix this without changing the default actions for a release and without changing the command line options for git-bloom-generate, so I am going to push this to the next major release 0.5.