~openstack-charmers/charms/trusty/cinder-ceph/next

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/fetch/giturl.py

  • Committer: Corey Bryant
  • Date: 2016-01-04 21:26:40 UTC
  • Revision ID: corey.bryant@canonical.com-20160104212640-7ybrhu4zmlk26q4k
[corey.bryant,r=trivial] Sync charm-helpers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
16
16
 
17
17
import os
 
18
from subprocess import check_call
18
19
from charmhelpers.fetch import (
19
20
    BaseFetchHandler,
20
 
    UnhandledSource
 
21
    UnhandledSource,
 
22
    filter_installed_packages,
 
23
    apt_install,
21
24
)
22
25
from charmhelpers.core.host import mkdir
23
26
 
24
 
import six
25
 
if six.PY3:
26
 
    raise ImportError('GitPython does not support Python 3')
27
 
 
28
 
try:
29
 
    from git import Repo
30
 
except ImportError:
31
 
    from charmhelpers.fetch import apt_install
32
 
    apt_install("python-git")
33
 
    from git import Repo
34
 
 
35
 
from git.exc import GitCommandError  # noqa E402
 
27
if filter_installed_packages(['git']) != []:
 
28
    apt_install(['git'])
 
29
    if filter_installed_packages(['git']) != []:
 
30
        raise NotImplementedError('Unable to install git')
36
31
 
37
32
 
38
33
class GitUrlFetchHandler(BaseFetchHandler):
40
35
    def can_handle(self, source):
41
36
        url_parts = self.parse_url(source)
42
37
        # TODO (mattyw) no support for ssh git@ yet
43
 
        if url_parts.scheme not in ('http', 'https', 'git'):
 
38
        if url_parts.scheme not in ('http', 'https', 'git', ''):
44
39
            return False
 
40
        elif not url_parts.scheme:
 
41
            return os.path.exists(os.path.join(source, '.git'))
45
42
        else:
46
43
            return True
47
44
 
48
 
    def clone(self, source, dest, branch, depth=None):
 
45
    def clone(self, source, dest, branch="master", depth=None):
49
46
        if not self.can_handle(source):
50
47
            raise UnhandledSource("Cannot handle {}".format(source))
51
48
 
 
49
        if os.path.exists(dest):
 
50
            cmd = ['git', '-C', dest, 'pull', source, branch]
 
51
        else:
 
52
            cmd = ['git', 'clone', source, dest, '--branch', branch]
52
53
        if depth:
53
 
            Repo.clone_from(source, dest, branch=branch, depth=depth)
54
 
        else:
55
 
            Repo.clone_from(source, dest, branch=branch)
 
54
            cmd.extend(['--depth', depth])
 
55
        check_call(cmd)
56
56
 
57
57
    def install(self, source, branch="master", dest=None, depth=None):
58
58
        url_parts = self.parse_url(source)
66
66
            mkdir(dest_dir, perms=0o755)
67
67
        try:
68
68
            self.clone(source, dest_dir, branch, depth)
69
 
        except GitCommandError as e:
70
 
            raise UnhandledSource(e)
71
69
        except OSError as e:
72
70
            raise UnhandledSource(e.strerror)
73
71
        return dest_dir