Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing pkg_name in install_sample_data.py #2267

Merged
merged 1 commit into from
Apr 11, 2018

Conversation

wkentaro
Copy link
Member

@wkentaro wkentaro commented Apr 11, 2018

Problem

pkg_name argument is required.
And ./install_sample_data.py fails...

Why this happens?

Because of the merge commit.
You can see git show 338d9b850623cb614eb5596fba9c6b7ff1e2b9c9.
The git log says @k-okada triggered git merge in #1991,
and this bug was introduced.

I'm not sure this is caused by the failure of auto git-merge or mistaken conflict resolving.
Do you remember something? @k-okada @furushchev

commit 338d9b850623cb614eb5596fba9c6b7ff1e2b9c9
Merge: 8382f6b 778063d
Author: Kei Okada <k-okada@jsk.t.u-tokyo.ac.jp>
Date:   Mon Jan 22 13:00:54 2018 +0900

    Merge branch 'master' into icp-2d

diff --cc jsk_pcl_ros/scripts/install_sample_data.py
index 0a8af1b,8b865d6..8b6618b
--- a/jsk_pcl_ros/scripts/install_sample_data.py
+++ b/jsk_pcl_ros/scripts/install_sample_data.py
@@@ -91,22 -91,14 +91,32 @@@ def main()
  
      download_data(
          pkg_name=PKG,
 +        path='sample/data/pr2_sink.bag.tgz',
 +        url='https://drive.google.com/uc?id=19VujodKsX7EJJwHetqFGCRYz0JBtZQ6h',
 +        md5='9bdc1500610a1a97480cae6fcf261811',
 +        extract=True,
 +        compressed_bags=[
 +            'sample/data/pr2_sink.bag',
 +        ],
 +    )
 +
 +    download_data(
 +        pkg_name=PKG,
 +        path='sample/data/kettle.pcd',
 +        url='https://drive.google.com/uc?id=1MpQ3MK3D5VTlmj--r9dFPrfyLPQU7LO0',
 +        md5='87579bdbb5f87a058697ace16887e37f',
 +        extract=False,
 +    )
 +
++    download_data(
+         path='sample/data/sample_door_handle_detector.bag',
+         url='https://drive.google.com/uc?id=0B4ysRIwB7GryMGxCTUI0MHhqWFk',
+         md5='f702e012730db7aaf01b9868280d8bca',
+         compressed_bags=[
+             'sample/data/sample_door_handle_detector.bag',
+         ],
+     )
+ 
+ 
  if __name__ == '__main__':
      main()

@wkentaro wkentaro self-assigned this Apr 11, 2018
@wkentaro wkentaro added the bug label Apr 11, 2018
@wkentaro
Copy link
Member Author

I was surprised that some PRs are merged with passed travis tests after this bug was introduced.
But I found that the bag file which cannot be installed because of this bug has not been used by tests and only used by sample.

@k-okada k-okada merged commit c6eb33e into jsk-ros-pkg:master Apr 11, 2018
@wkentaro wkentaro deleted the fix_install_sample_data branch April 12, 2018 00:14
@wkentaro wkentaro added this to the 1.2.6 milestone Apr 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants