willowgarage/catkin — Issue #70: location of stack.yaml 
Author: isucan
Created: 2012-02-07 00:38:23+00:00
State: open

By default the git-catkin-import-upstream script loads stack.yaml from upstream. For 3rdparty packages, there is no need for that stack.yaml to be upstream; it can instead live next to catkin.conf, in the catkin branch. All that takes is to modify git-catkin-import-upstream to look for the stack.yaml in the secondary location, if it is not found upstream:

begin diff:

41,52c41
< if [ -e $UPSTREAM_CLONE/stack.yaml ]
< then
< read_stack_yaml $UPSTREAM_CLONE/stack.yaml
< else
< if [ -e stack.yaml ]
< then
<	read_stack_yaml stack.yaml
< else
<	status "stack.yaml not found"
< fi
< fi
<
---
> read_stack_yaml $UPSTREAM_CLONE/stack.yaml

end diff