diff --git a/ChangeLog b/ChangeLog index 42625105a9003c0f2b6809de24f11cedc4a14024..92c5c4fa4a06afbc5435f70dbb5745d1874e486e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-10-21, v0.7.3 + * Instruct kamaki to ignore the ssl certificates (kamaki >= 0.13rc5). + +2014-10-14, v0.7.2 + * Fix an exception triggered when collecting Ubuntu metadata + 2014-10-06, v0.7.1 * Fix a bug in host bundling operation where the file system UUIDs and Labels where not preserved diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py index 4f548a04661c1cf3c5e9c9ff0a9d0257ced0122d..38950ae0ba4b89cab9b9a4b95c6d753061e34f26 100644 --- a/image_creator/kamaki_wrapper.py +++ b/image_creator/kamaki_wrapper.py @@ -30,6 +30,12 @@ from kamaki.clients.image import ImageClient from kamaki.clients.pithos import PithosClient from kamaki.clients.astakos import CachedAstakosClient as AstakosClient +try: + from kamaki.clients.utils import https + https.patch_ignore_ssl() +except ImportError: + pass + try: config = Config() except Exception as e: diff --git a/image_creator/os_type/ubuntu.py b/image_creator/os_type/ubuntu.py index 7b73ab4d96e6c8915c67044a00b5e5ba52af679f..1c6724bfa10e82e292b28f6977c4b792ae7a9ce9 100644 --- a/image_creator/os_type/ubuntu.py +++ b/image_creator/os_type/ubuntu.py @@ -30,7 +30,7 @@ class Ubuntu(Linux): super(Ubuntu, self)._do_collect_metadata() - regexp = re.compile('^(k|l|x)?ubuntu-desktop$') + regexp = re.compile('^(k|l|x)ubuntu-desktop$') variant = "" for app in self.image.g.inspect_list_applications(self.root): match = regexp.match(app['app_name']) diff --git a/image_creator/version.py b/image_creator/version.py index aba15301e18d74ae7ced97f1176c1d69846e4cd3..1b458be5d4656ff969c978e8670657eca19a4fa7 100644 --- a/image_creator/version.py +++ b/image_creator/version.py @@ -1,8 +1,8 @@ -__version__ = "0.7.1next" +__version__ = "0.7.3next" __version_vcs_info__ = { 'branch': 'develop', - 'revid': '38f51b2', - 'revno': 573} + 'revid': 'bcce9f1', + 'revno': 582} __version_user_email__ = "skalkoto@grnet.gr" __version_user_name__ = "Nikos Skalkotos" diff --git a/version b/version index 0006a59a42df60677701b774c99b69423eab5904..5c8b454f233d0010f5df0cf5a63955755d51b672 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.7.1next +0.7.3next