Permalink
Browse files

Merge branch 'master' of github.com:zotonic/zotonic

  • Loading branch information...
mmzeeman committed Nov 13, 2012
2 parents a5bcb2b + ca3a6e4 commit 7a6853dd29f30a330d71132a68fd4986274279c4
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/install/z_install_data.erl
@@ -117,7 +117,9 @@ install_modules(empty, Host, C) ->
],
install_modules(Modules, C);
install_modules(nodb, _, _) ->
- ok.
+ ok;
+install_modules(Err, Host, _) ->
+ ?ERROR("~p: Invalid or missing skeleton: ~p.", [Host, Err]).
install_modules(Modules, C) ->
?DEBUG("Inserting modules"),

2 comments on commit 7a6853d

Owner

kaos replied Nov 14, 2012

Hint to @mmzeeman : http://zotonic.com/docs/dev/codestyle.html#git-best-practices 3rd bullet ;)

that is also possible to get by default, see: http://www.kernel.org/pub/software/scm/git/docs/git-config.html (search for rebase, most notably branch..rebase)

Owner

mmzeeman replied Nov 14, 2012

Thanks, git is somewhat black magic for me, but learning… Throwing away a lot of borked up repo's in the process.

At work we use mercurial, so I type git pull instead of fetch and things like that. :-)

Please sign in to comment.