diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:08:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:08:23 +0100 |
| commit | 27fd0790a9efdc6fc3dbc7aff09dea23c020cbda (patch) | |
| tree | 873d5eec1618cc85afa279dbbecc558883167323 | |
| parent | fba449f4386981ca1d8638b3272dcb63cf3008e9 (diff) | |
| parent | 6622e43356d9bf8feb11791e41eda650ceb78551 (diff) | |
Merge branch 'master' into working-dir-changes
| -rwxr-xr-x | cdist | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -193,7 +193,7 @@ class Version: self.devel = False def __str__(self): - s = '%d.%02d.%d' % (self.major, self.minor, self.micro) + s = '%d.%d.%d' % (self.major, self.minor, self.micro) if self.devel: s += 'devel' @@ -532,8 +532,8 @@ class Project(object): command('git clone %s %s/%s.git %s/src/%s' % (flags, config.get('git_prefix'), self.name, target.work_dir_cdist(), self.name)) os.chdir('%s/src/%s' % (target.work_dir_cdist(), self.name)) command('git checkout %s %s %s' % (flags, self.specifier, redirect)) - command('git submodule init') - command('git submodule update') + command('git submodule init --quiet') + command('git submodule update --quiet') os.chdir(self.directory) proj = '%s/src/%s/%s' % (target.work_dir_cdist(), self.name, self.directory) |
