invert order of package type detection (dry before wet) (ros/rospkg#30)

[dirk-thomas]

@tfoote @wjwwood Please review and consider scenarios where inverting the precedence could be a problem.

[wjwwood]

Is return the correct thing to do here?

It seems like it used to be that if there were neither package.xml nor manifest.xml it would continue:

if package.xml
  process package.xml
else
 process manifest.xml
endif
# continue with code...

But it will return if that is the case:

if manifest.xml
  process manifest.xml
else if package.xml
  process package.xml
else
  return
endif
# continue with code..

[dirk-thomas]

Returning directly in the case that neither of the files exist seems to be cleaner behavior.
Anyway this should not happen since it is always checked with isStackage() if the path is one of these two types.

[tfoote]

If in a wet workspace this won't give link flags because it won't be
queried. Enabling this behavior will prevent the ability to catkin_make
and rosmake the same directory as it will be detected by both, and compiled
for both passes.

On Mon, Mar 11, 2013 at 6:20 PM, Dirk Thomas notifications@github.comwrote:

@tfoote https://github.com/tfoote @wjwwood https://github.com/wjwwoodPlease review and consider scenarios where inverting the precedence could

be a problem.

You can merge this Pull Request by running

git pull https://github.com/ros/rospack dry_wet_order

Or view, comment on, or merge it at:

#11
Commit Summary

• invert order of package type detection (dry before wet)
  (Support or forbid catkin and rosbuild manifest sibling ros-infrastructure/rospkg#30)

File Changes

• M src/rospack.cpphttps://github.com/invert order of package type detection (dry before wet) (ros/rospkg#30) #11/files#diff-0(10)

Patch Links:

• https://github.com/ros/rospack/pull/11.patch
• https://github.com/ros/rospack/pull/11.diff

[dirk-thomas]

@tfoote rospack will alway return the dry flags for a hybrid package but the result should be equal to the wet information (else the meta information stored in both files is inconsistent). Building a workspace with catkin_make and after that with rosmake should be fine the dry variant should overlay the wet variant as it is built in a overlay on top.

[wjwwood]

I can't think of any way this could break something, but that's not to say it won't. Either way +1