Empty files are getting lost from source to debian about bloom

[wjwwood]

I am unable to see where empty files get lost in the bloom process.

∫ git clone https://github.com/ros-gbp/ros_comm-release.git:

Cloning into 'ros_comm-release'...
remote: Counting objects: 7245, done.
remote: Compressing objects: 100% (4342/4342), done.
remote: Total 7245 (delta 2689), reused 6626 (delta 2070)
Receiving objects: 100% (7245/7245), 1.99 MiB | 1001 KiB/s, done.
Resolving deltas: 100% (2689/2689), done.

∫ cd ros_comm-release/

∫ git-bloom-import-upstream --replace:

[git-bloom-import-upstream]: upstream repo: [email protected]:ros/ros_comm.git
[git-bloom-import-upstream]: upstream type: git
[git-bloom-import-upstream]: upstream branch: (No branch set)
[git-bloom-import-upstream]: Verifying a couple of things about the upstream git repo...
[git-bloom-import-upstream]: Verifying that [email protected]:ros/ros_comm.git is a git repository... pass
[git-bloom-import-upstream]: Verifying that [email protected]:ros/ros_comm.git is not a gbp repository... pass
[git-bloom-import-upstream]: Checking for package.xml(s)
[git-bloom-import-upstream]: package.xml(s) found
[git-bloom-import-upstream]: Upstream has version 1.9.18
[git-bloom-import-upstream]: Upstream contains packages: rosgraph_msgs, rosout, message_filters, roswtf, rostopic, xmlrpcpp, ros_comm, topic_tools, rosnode, rosgraph, rostest, std_srvs, rosmsg, rosparam, rosservice, rosmaster, roslaunch, rosbag, rospy, roscpp, rosconsole
[git-bloom-import-upstream]: Exporting version 1.9.18
[git-bloom-import-upstream]: The latest upstream tag in the release repository is upstream/1.9.18
[git-bloom-import-upstream]: Version discrepancy:
    The upstream version, 1.9.18, is equal to a previous import version. Removing conflicting tag before continuing because the '--replace' options was specified.
gbp:info: Importing '/tmp/bloom_XsDzei/upstream-1.9.18.tar.gz' to branch 'upstream'...
gbp:info: Source package is upstream
gbp:info: Upstream version is 1.9.18
gbp:info: Successfully imported version 1.9.18 of /tmp/bloom_XsDzei/upstream-1.9.18.tar.gz
I'm happy.  You should be too.

∫ git checkout upstream:

Branch upstream set up to track remote branch upstream from origin.
Switched to a new branch 'upstream'

∫ find clients/rospy | grep __init__.py | xargs wc -l:

   0 clients/rospy/src/rospy/impl/__init__.py
 129 clients/rospy/src/rospy/__init__.py
 129 total

∫ cat clients/rospy/src/rospy/impl/__init__.py:

∫ git checkout master

∫ git-bloom-release groovy:

[git-bloom-release]: Running git-bloom-branch --src upstream release --interactive
 [git-bloom-branch]: Changing to specified source branch upstream
 [git-bloom-branch]: Branching these packages: ['rosgraph_msgs', 'rosout', 'message_filters', 'roswtf', 'rostopic', 'xmlrpcpp', 'ros_comm', 'topic_tools', 'rosnode', 'rosgraph', 'rostest', 'std_srvs', 'rosmsg', 'rosparam', 'rosservice', 'rosmaster', 'roslaunch', 'rosbag', 'rospy', 'roscpp', 'rosconsole']
Continue [Y/n]? 

 [git-bloom-branch]: Branching rosgraph_msgs_1.9.18 to release/rosgraph_msgs
   [git-bloom-patch import]: No patches in the patches branch, nothing to do
 [git-bloom-branch]: Branching rosgraph_msgs_1.9.18 to release/rosgraph_msgs returned 0

 ..... [snipped]

[git-bloom-release]: Running git-bloom-generate-debian-all --debian-revision 0 groovy release
[git-bloom-release]: This will run git-bloom-generate-debian on these pacakges: ['release/message_filters', 'release/ros_comm', 'release/rosbag', 'release/rosconsole', 'release/roscpp', 'release/rosgraph', 'release/rosgraph_msgs', 'release/roslaunch', 'release/rosmaster', 'release/rosmsg', 'release/rosnode', 'release/rosout', 'release/rosparam', 'release/rospy', 'release/rosservice', 'release/rostest', 'release/rostopic', 'release/roswtf', 'release/std_srvs', 'release/topic_tools', 'release/xmlrpcpp']
Continue [Y/n]? y
[git-bloom-release]: Branching to debian prefix with: git-bloom-branch --src release/message_filters debian/groovy/message_filters
 [git-bloom-branch]: Changing to specified source branch release/message_filters
 [git-bloom-branch]: Branching these packages: ['message_filters']

 [git-bloom-branch]: Branching message_filters_1.9.18 to debian/groovy/message_filters
   [git-bloom-patch import]: No patches in the patches branch, nothing to do
 [git-bloom-branch]: Branching message_filters_1.9.18 to debian/groovy/message_filters returned 0
[git-bloom-release]: Calling git-bloom-generate-debian-all -t debian/groovy/message_filters groovy --debian-revision 0
[git-bloom-release]: Updating rosdep
[git-bloom-release]: No homepage set, defaulting to ''
BuildDepends is set(['rosconsole', 'catkin', 'roscpp', 'xmlrpcpp', 'rostest', 'rosunit', 'boost']) for message_filters, from ./package.xml
BuildDepends in is rosconsole out is ['ros-groovy-rosconsole']
BuildDepends in is catkin out is ['ros-groovy-catkin']
BuildDepends in is roscpp out is ['ros-groovy-roscpp']
BuildDepends in is xmlrpcpp out is ['ros-groovy-xmlrpcpp']
BuildDepends in is rostest out is ['ros-groovy-rostest']
BuildDepends in is rosunit out is ['ros-groovy-rosunit']
BuildDepends in is boost out is ['libboost1.46-all-dev']
message_filters has the following dependencies for ubuntu oneiric
Run dependencies:
set(['ros-groovy-rosconsole', 'ros-groovy-roscpp', 'ros-groovy-xmlrpcpp'])
Build dependencies:
set(['libboost1.46-all-dev',
     'ros-groovy-catkin',
     'ros-groovy-rosconsole',
     'ros-groovy-roscpp',
     'ros-groovy-rostest',
     'ros-groovy-rosunit',
     'ros-groovy-xmlrpcpp'])
source_dir=.
Reading control template from resources/em/control.em
Reading changelog template from resources/em/changelog.em
Reading rules template from resources/em/rules.cmake.em
+ cd . && git add debian
+ cd . && git commit -m + Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.18
[debian/groovy/message_filters 47de52c] + Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.18
 5 files changed, 74 insertions(+)
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100755 debian/rules
 create mode 100644 debian/source/format
tag: debian/ros-groovy-message-filters_1.9.18-0_oneiric
+ cd . && git tag -f debian/ros-groovy-message-filters_1.9.18-0_oneiric -m Debian release 1.9.18
Updated tag 'debian/ros-groovy-message-filters_1.9.18-0_oneiric' (was f387f58)
BuildDepends in is rosconsole out is ['ros-groovy-rosconsole']
BuildDepends in is catkin out is ['ros-groovy-catkin']
BuildDepends in is roscpp out is ['ros-groovy-roscpp']
BuildDepends in is xmlrpcpp out is ['ros-groovy-xmlrpcpp']
BuildDepends in is rostest out is ['ros-groovy-rostest']
BuildDepends in is rosunit out is ['ros-groovy-rosunit']
BuildDepends in is boost out is ['libboost-all-dev']
message_filters has the following dependencies for ubuntu precise
Run dependencies:
set(['ros-groovy-rosconsole', 'ros-groovy-roscpp', 'ros-groovy-xmlrpcpp'])
Build dependencies:
set(['libboost-all-dev',
     'ros-groovy-catkin',
     'ros-groovy-rosconsole',
     'ros-groovy-roscpp',
     'ros-groovy-rostest',
     'ros-groovy-rosunit',
     'ros-groovy-xmlrpcpp'])
source_dir=.
Reading control template from resources/em/control.em
Reading changelog template from resources/em/changelog.em
Reading rules template from resources/em/rules.cmake.em
+ cd . && git add debian
+ cd . && git commit -m + Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.18
[debian/groovy/message_filters 46f7b36] + Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.18
 2 files changed, 2 insertions(+), 2 deletions(-)
tag: debian/ros-groovy-message-filters_1.9.18-0_precise
+ cd . && git tag -f debian/ros-groovy-message-filters_1.9.18-0_precise -m Debian release 1.9.18
Updated tag 'debian/ros-groovy-message-filters_1.9.18-0_precise' (was ff6372b)
BuildDepends in is rosconsole out is ['ros-groovy-rosconsole']
BuildDepends in is catkin out is ['ros-groovy-catkin']
BuildDepends in is roscpp out is ['ros-groovy-roscpp']
BuildDepends in is xmlrpcpp out is ['ros-groovy-xmlrpcpp']
BuildDepends in is rostest out is ['ros-groovy-rostest']
BuildDepends in is rosunit out is ['ros-groovy-rosunit']
BuildDepends in is boost out is ['libboost-all-dev']
message_filters has the following dependencies for ubuntu quantal
Run dependencies:
set(['ros-groovy-rosconsole', 'ros-groovy-roscpp', 'ros-groovy-xmlrpcpp'])
Build dependencies:
set(['libboost-all-dev',
     'ros-groovy-catkin',
     'ros-groovy-rosconsole',
     'ros-groovy-roscpp',
     'ros-groovy-rostest',
     'ros-groovy-rosunit',
     'ros-groovy-xmlrpcpp'])
source_dir=.
Reading control template from resources/em/control.em
Reading changelog template from resources/em/changelog.em
Reading rules template from resources/em/rules.cmake.em
+ cd . && git add debian
+ cd . && git commit -m + Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.18
[debian/groovy/message_filters 9560d75] + Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.18
 1 file changed, 1 insertion(+), 1 deletion(-)
tag: debian/ros-groovy-message-filters_1.9.18-0_quantal
+ cd . && git tag -f debian/ros-groovy-message-filters_1.9.18-0_quantal -m Debian release 1.9.18
Updated tag 'debian/ros-groovy-message-filters_1.9.18-0_quantal' (was 1ed7b18)
[git-bloom-release]: Branching to debian prefix with: git-bloom-branch --src release/ros_comm debian/groovy/ros_comm


...... [snipped]


Updated tag 'debian/ros-groovy-xmlrpcpp_1.9.18-0_quantal' (was 99629eb)



Everything went as expected, you should check that the new tags match your expectations, and then push to the gbp repo with:
  git push --force --all && git push --tags

∫ git checkout release/rospy

∫ find . | grep __init__.py | xargs wc -l:

   0 ./src/rospy/impl/__init__.py
 129 ./src/rospy/__init__.py
 129 total

∫ git checkout debian/groovy/rospy

∫ find . | grep __init__.py | xargs wc -l:

   0 ./src/rospy/impl/__init__.py
 129 ./src/rospy/__init__.py
 129 total

∫ git checkout debian/groovy/rospy/1.9.18:

Note: checking out 'debian/groovy/rospy/1.9.18'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at ead02a1... Rebase from release/rospy

∫ find . | grep __init__.py | xargs wc -l:

   0 ./src/rospy/impl/__init__.py
 129 ./src/rospy/__init__.py
 129 total

∫ git checkout debian/ros-groovy-rospy_1.9.18-0_quantal:

Previous HEAD position was ead02a1... Rebase from release/rospy
HEAD is now at b9c7983... + Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.18

∫ find . | grep __init__.py | xargs wc -l:

   0 ./src/rospy/impl/__init__.py
 129 ./src/rospy/__init__.py
 129 total

The empty files persist all the way through, as far as I can tell.

Thoughts?

[wjwwood]

Seems like this might be a problem with calling git-buildpackage on the buildfarm side.

@dirk-thomas is looking into it.

[dirk-thomas]

The problem is that the current orig tarball contains the full content of the repository (not only the package). Then "git buildpackage" will create a patch to transition from orig to the specific package-root state. In that process patch is not able to handle empty files which makes them disappear.

Passing the command line arguments --git-upstream-branch and --git-upstream-tree is not working for the lucid version. Instead bloom will generate a debian/gbp.conf file containing these information.

[dirk-thomas]

fixed in 6b0c543