dirvish: "--vault vault:branch" and "--vault vault --branch branch" load different config files

[Moritz Bunkus]

System information:

Ubuntu version: Ubuntu 8.04.1
Package version: 1.2.1-1

Bug report:

Dirvish loads different configuration files when it is run via "dirvish --vault vault:branch" compared to "dirvish --vault vault --branch branch".

In the first case it only loads /path/to/vault/dirvish/branch.conf. In the second case it first loads /path/to/vault/dirvish/default.conf, aborts if said configuration file is not found or contains errors (e.g. client not defined), and only loads
/path/to/vault/dirvish/branch.conf afterwards.

This is important because if you use branches in your master.conf then /usr/sbin/dirvish-runall uses the "--vault vault:branch" syntax whereas the man page suggests that you use "--vault vault --branch branch".

The expected behaviour is that in both cases dirvish loads the same configuration files.

For example, I've defined common options like "client" in default.conf because "--vault ... --branch ..." wouldn't run otherwise. Then I left out those common options from the branch configuration files. However, started by dirvish-runall dirvish would not run my backups because default.conf was not read.