summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-03-24 18:56:32 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-03-24 18:56:32 -0300
commitfea2ecd327eafaa81b8ff03aefe81a7a36c068eb (patch)
tree8de2f06fc9b4a49a72e90058a6fd728d71bfd2f7
parent30b813bf64d200d560bb1d5aef9e6a22e651a7cf (diff)
downloadhydra-fea2ecd327eafaa81b8ff03aefe81a7a36c068eb.tar.gz
hydra-fea2ecd327eafaa81b8ff03aefe81a7a36c068eb.tar.bz2
Ensure the submodule has a branch at module-update
-rw-r--r--TODO.md7
-rwxr-xr-xshare/hydra/module-update11
2 files changed, 14 insertions, 4 deletions
diff --git a/TODO.md b/TODO.md
index 6cba84c..35704bd 100644
--- a/TODO.md
+++ b/TODO.md
@@ -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