diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-03-24 15:35:19 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-03-24 15:35:19 -0300 |
| commit | d53219950d86589d024ce5c711db41ad12ebdfab (patch) | |
| tree | 0e163b1e83cc6b038243b02e303cb2ff1a73f259 /share | |
| parent | c60f1f181a23b880053a6a76abc1d8ef78b9b980 (diff) | |
| download | hydra-d53219950d86589d024ce5c711db41ad12ebdfab.tar.gz hydra-d53219950d86589d024ce5c711db41ad12ebdfab.tar.bz2 | |
Allow work on different branches on module-{update,verify}
Diffstat (limited to 'share')
| -rwxr-xr-x | share/hydra/module-update | 2 | ||||
| -rwxr-xr-x | share/hydra/module-verify | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/hydra/module-update b/share/hydra/module-update index 99dbd7f..f8a7ce3 100755 --- a/share/hydra/module-update +++ b/share/hydra/module-update @@ -34,7 +34,7 @@ function hydra_module_update { fi # Update the module - ( cd $PUPPET/modules/$MODULE; git pull origin master ) + ( cd $PUPPET/modules/$MODULE; git pull origin `git branch` ) # Verify the module if ! hydra $HYDRA module-verify $MODULE; then diff --git a/share/hydra/module-verify b/share/hydra/module-verify index cdc6b29..aa84c4d 100755 --- a/share/hydra/module-verify +++ b/share/hydra/module-verify @@ -35,7 +35,7 @@ HASH_SUBMODULE="`git submodule | grep -E "modules/$MODULE( |$)" | awk '{ print $ cd $HYDRA_FOLDER/modules/$MODULE -HASH_MODULE="`git log -1 | grep "^commit" | awk '{ print $2 }' | sed -e 's/\+//'`" +HASH_MODULE="`git log -1 "commit" | awk '{ print $2 }' | sed -e 's/\+//'`" if [ "$HASH_MODULE" != "$HASH_SUBMODULE" ]; then echo "Module $MODULE: hash differ!!:" |