[Pkg-xen-changes] [xen] 03/03: genorig.py: Automatically determine release tag

[Ian Campbell]

This is an automated email from the git hooks/post-receive script.

ijc-guest pushed a commit to branch feature/genorig
in repository xen.

commit 870686100a21996b502f79c8cbf2bc049f2e99e3
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Fri Jul 4 12:42:10 2014 +0100

    genorig.py: Automatically determine release tag
---
 debian/bin/genorig.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index dc46cd7..9dbe866 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -48,19 +48,21 @@ class Main(object):
         if options.override_version:
             self.version = VersionXen('%s-0' % options.override_version)
 
-        if os.path.exists(os.path.join(repo, '.hg')):
-            self.repo = RepoHg(repo, options)
-        elif os.path.exists(os.path.join(repo, '.git')):
-            self.repo = RepoGit(repo, options)
-        else:
-            raise NotImplementedError
-
         if options.component:
             self.orig_dir = options.component
             self.orig_tar = '%s_%s.orig-%s.tar.gz' % (self.source, self.version.upstream, options.component)
         else:
             self.orig_dir = '%s-%s' % (self.source, self.version.upstream)
             self.orig_tar = '%s_%s.orig.tar.gz' % (self.source, self.version.upstream)
+            if options.tag is None:
+                options.tag = 'RELEASE-' + self.version.upstream
+
+        if os.path.exists(os.path.join(repo, '.hg')):
+            self.repo = RepoHg(repo, options)
+        elif os.path.exists(os.path.join(repo, '.git')):
+            self.repo = RepoGit(repo, options)
+        else:
+            raise NotImplementedError
 
         try:
             os.symlink(os.path.join('orig', self.orig_tar), os.path.join('..', self.orig_tar))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git