search

pixelated / puppet-pixelated

Puppet Module to setup the Pixelated User Agent
GNU Affero General Public License v3.0
13 stars 4 forks source link

subrepos break leap_cli #50

Closed cz8s closed 8 years ago

cz8s commented 8 years ago

since we changed platform-environements repo to subrepos, leap_cli breaks. See https://leap.se/code/issues/8248

There are two prs pending: https://github.com/leapcode/leap_cli/pull/19 https://github.com/leapcode/leap_platform/pull/107

varac commented 8 years ago

@cz8s the leap_cli mr is merged, the platform one contains conflicts, please rebase.

varac commented 8 years ago

ok, using git submodule deinit before pulling cleans up things:

git submodule deinit .
rm -rf puppet/modules/*
git pull
git checkout puppet/modules/
cz8s commented 8 years ago

this is easier:

for dir in $(git submodule | awk '{print $2}'); do
git submodule deinit $dir
done

then you can do a git pull