From ace03b28f02c07f12e2f1c80d088da8590573f75 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 23 May 2014 17:55:09 +0100 Subject: Quieten submodule commands. --- cdist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist b/cdist index 89bc719..dca6717 100755 --- a/cdist +++ b/cdist @@ -523,8 +523,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) -- cgit v1.2.3 From 6622e43356d9bf8feb11791e41eda650ceb78551 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Jul 2014 12:31:20 +0100 Subject: Don't pad minor version numbers to two figures. --- cdist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist b/cdist index dca6717..17b4629 100755 --- a/cdist +++ b/cdist @@ -174,7 +174,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' -- cgit v1.2.3 From ac75ac45521450ba2f4594d23130780053627957 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 18 Jul 2014 13:10:01 +0000 Subject: Replace devel in versions with the git commit. --- cdist | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cdist b/cdist index 17b4629..5fc1114 100755 --- a/cdist +++ b/cdist @@ -511,6 +511,7 @@ class Project(object): self.directory = directory self.version = None self.specifier = specifier + self.git_commit = None if self.specifier is None: self.specifier = 'master' @@ -523,6 +524,7 @@ 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)) + self.git_commit = command_and_read('git rev-parse --short=7 HEAD').readline().strip() command('git submodule init --quiet') command('git submodule update --quiet') os.chdir(self.directory) @@ -581,6 +583,11 @@ def append_version_to_debian_changelog(version): command('dch -b -v %s-1 "New upstream release."' % version) +def devel_to_git(project, filename): + if project.git_commit is not None: + filename = filename.replace('devel', '-%s' % project.git_commit) + return filename + # # Command-line parser # @@ -637,10 +644,10 @@ elif args.command == 'package': except: pass for p in packages: - copyfile(p, '%s/%s' % (out, os.path.basename(p))) + copyfile(p, '%s/%s' % (out, os.path.basename(devel_to_git(project, p)))) else: for p in packages: - copyfile(p, '%s/%s' % (args.output, os.path.basename(p))) + copyfile(p, '%s/%s' % (args.output, os.path.basename(devel_to_git(project, p)))) if not args.keep: target.cleanup() -- cgit v1.2.3