diff options
| -rw-r--r-- | TODO.md | 7 | ||||
| -rwxr-xr-x | share/hydra/module-update | 11 |
2 files changed, 14 insertions, 4 deletions
@@ -91,6 +91,8 @@ Puppet modules - force option via rsync/rdiff handlers - enable ecdsa key - general: + - features/autoload: nodo, virtual, dhcp and others + - module-update: nodo backup git websites - rollback of commits about charset. - switch to conf.d: - php ("refactor" branch), remove E_STRICT from production's error_reporting. @@ -108,9 +110,8 @@ Puppet modules - puppetlast. - bug report: debian wheezy puppetmaster-passenger: not honoring certname / envvars LANG issue. - bug report: debian wheezy puppet-common: needs the following patch: http://projects.puppetlabs.com/issues/10963 -- backup: - - `sync-media-iterate [volume]`. - - merge feature/autoload +- backup: `sync-media-iterate [volume]`. +- backupninja: parametrized classes without dynamic lookups. - munin: enable/disable cgi graphing. - mysql: - prefetech: https://github.com/DavidS/puppet-mysql-old/issues/3 diff --git a/share/hydra/module-update b/share/hydra/module-update index f4c70c7..0a9fc1a 100755 --- a/share/hydra/module-update +++ b/share/hydra/module-update @@ -34,7 +34,16 @@ function hydra_module_update { fi # Update the module - ( cd $PUPPET/modules/$MODULE; git pull ) + ( + cd $PUPPET/modules/$MODULE + + # Ensure the submodule has a branch + if git branch | grep -q "(no branch)"; then + git checkout master + fi + + git pull + ) # Verify the module if ! hydra $HYDRA module-verify $MODULE; then |