From: Loic Dachary Date: Wed, 18 Nov 2015 22:42:41 +0000 (+0100) Subject: buildpackages: implement get_pkg_type X-Git-Tag: v10.2.6~165^2^2~277^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13fb23ed69e6b7dfa5c005e81abc6b983c019ba4;p=ceph.git buildpackages: implement get_pkg_type It can be deprectated when it is implemented in teuthology. Signed-off-by: Loic Dachary --- diff --git a/tasks/buildpackages.py b/tasks/buildpackages.py index 52732073e22d..28c696e70503 100644 --- a/tasks/buildpackages.py +++ b/tasks/buildpackages.py @@ -29,6 +29,12 @@ class LocalGitbuilderProject(packaging.GitbuilderProject): pass +def get_pkg_type(os_type): + if os_type in ('centos', 'fedora', 'opensuse', 'rhel', 'sles'): + return 'rpm' + else: + return 'deb' + def apply_overrides(ctx, config): if config is None: config = {} @@ -131,7 +137,7 @@ def task(ctx, config): arch = ctx.config.get('arch', 'x86_64') dist = LocalGitbuilderProject()._get_distro(distro=os_type, version=os_version) - pkg_type = misc.get_pkg_type(os_type) + pkg_type = get_pkg_type(os_type) check_call( "flock --close /tmp/buildpackages " + "make -C " + d + " " + os.environ['HOME'] + "/.ssh_agent",