diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
| commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
| tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/bin/submodules | |
| parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
| parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
| download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 | |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/bin/submodules')
| -rwxr-xr-x | puppet/bin/submodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/bin/submodules b/puppet/bin/submodules index f79b635..3abc46d 100755 --- a/puppet/bin/submodules +++ b/puppet/bin/submodules @@ -20,7 +20,7 @@ for repo in $repos; do module="`basename $repo .git | sed -e s/^puppet-//`" if [ ! -d "modules/$module" ]; then echo "Processing puppet module $module..." - git submodule add $repo modules/$module + git submodule add -f $repo modules/$module elif [ -e "modules/$module/.git" ]; then # The puppet module exists and is a git submodule, so update it ( cd module/$module && git pull origin master ) |