From 6d83a68f57e8cd2dfbd11952ef5c317b4b49187d Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Jan 14 2015 08:15:26 +0000
Subject: setup: enable GH-backed inter-release archive downloads


Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

---

diff --git a/__root__/setup.py b/__root__/setup.py
index 3fe9e25..2381680 100644
--- a/__root__/setup.py
+++ b/__root__/setup.py
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
+# Copyright 2015 Red Hat, Inc.
 # Part of clufter project
 # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Setup script/data"""
@@ -532,13 +532,17 @@ def cond_require(package, *packages, **preferred):
     return ()
 
 url_dict = dict(name=pkg_name, ver=pkg.version)
+download_url = ''
 if PREFER_GITHUB:
     url = 'https://github.com/jnpkrn/{name}'
-    download_url = url + '/tarball/v{ver}'
+    if 'git.' in pkg.version:
+        download_url = url + '/tarball/' + pkg.version.partition('git.')[-1]
+    elif pkg.version.split('+')[-1] != 'a':
+        download_url = url + '/tarball/v{ver}'
 else:
     url = 'http://people.redhat.com/jpokorny/pkgs/{name}'
-    download_url = url + '/{name}-{ver}.tar.gz'
-download_url = download_url if '-' not in pkg.version else ''
+    if pkg.version.split('+')[-1] != 'a':
+        download_url = url + '/{name}-{ver}.tar.gz'
 
 setup(