Skip to content
Snippets Groups Projects
Commit 84d18880 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'master' into debian-precise

parents 53deec74 d235e498
No related branches found
No related tags found
No related merge requests found
2014-10-14, v0.7.2
* Fix an exception triggered when collecting Ubuntu metadata
2014-10-06, v0.7.1 2014-10-06, v0.7.1
* Fix a bug in host bundling operation where the file system UUIDs and * Fix a bug in host bundling operation where the file system UUIDs and
Labels where not preserved Labels where not preserved
......
...@@ -30,7 +30,7 @@ class Ubuntu(Linux): ...@@ -30,7 +30,7 @@ class Ubuntu(Linux):
super(Ubuntu, self)._do_collect_metadata() super(Ubuntu, self)._do_collect_metadata()
regexp = re.compile('^(k|l|x)?ubuntu-desktop$') regexp = re.compile('^(k|l|x)ubuntu-desktop$')
variant = "" variant = ""
for app in self.image.g.inspect_list_applications(self.root): for app in self.image.g.inspect_list_applications(self.root):
match = regexp.match(app['app_name']) match = regexp.match(app['app_name'])
......
__version__ = "0.7.1" __version__ = "0.7.2"
__version_vcs_info__ = { __version_vcs_info__ = {
'branch': 'hotfix-0.7.1', 'branch': 'hotfix-0.7.2',
'revid': '080bf9c', 'revid': '7b0713f',
'revno': 578} 'revno': 582}
__version_user_email__ = "skalkoto@grnet.gr" __version_user_email__ = "skalkoto@grnet.gr"
__version_user_name__ = "Nikos Skalkotos" __version_user_name__ = "Nikos Skalkotos"
0.7.1 0.7.2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment