diff --git a/AUTHORS b/AUTHORS
index 1a50d8020ab5997328a2b9b3d6bd03be2ea26286..719123fb0cddffd2b30ddaaf03a2acca82078945 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,7 @@
-MAIN DEVELOPERS:
-Nikos Skalkotos <skalkoto@grnet.gr>
-
-CONTRIBUTORS:
-Alex Pyrgiotis <apyrgio@cslab.ece.ntua.gr>
-Vangelis Koukis <vkoukis@grnet.gr>
-Giannis Spiliopoulos <gspilio@admin.grnet.gr>
-Konstantinos Tompoulidis <kostikas@grnet.gr>
+Nikos Skalkotos
+Alex Pyrgiotis
+Vangelis Koukis
+Giannis Spiliopoulos
+Konstantinos Tompoulidis
+Dionysis Grigoropoulos
diff --git a/ChangeLog b/ChangeLog
index 2b8d47f95f95c0e7f76dced37a94c30cb298b004..852b0eeda8a73ff59d8137b1f953112e63da57be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-10, v0.6.2
+ * Add support for Ubuntu 14.04
+ * Fix a bug in Windows image creation
+ * Add .kamaki.log in the user's personal data to be removed
+ * Fix minor issues in the documentation
+
+2014-01-10, v0.6.1
+ * Comply with the AstakosClient changes made in kamaki 0.12
+
2014-01-08, v0.6
* Rename the dialog-based application to snf-image-creator and the
non-interactive command line one to snf-mkimage
diff --git a/docs/conf.py b/docs/conf.py
index e4c80a747e78f3558170649b67e4c989fc219c3e..cade830ca2c407c3547cef7092f78b587d012524 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,6 +14,10 @@
import sys
import os
+import imp
+
+VERSION = getattr(imp.load_source(
+ 'image_creator.version', '../image_creator/version.py'), '__version__')
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -43,16 +47,16 @@ master_doc = 'index'
# General information about the project.
project = u'snf-image-creator'
-copyright = u'2012, 2013 GRNET S.A. All rights reserved'
+copyright = u'2012-2014 GRNET S.A. All rights reserved'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '0.6'
+version = VERSION
# The full version, including alpha/beta/rc tags.
-release = '0.6'
+release = VERSION
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/usage.rst b/docs/usage.rst
index 6e436a705f5f915c02fc984bb402dfcd8ea14235..d7caa1f23cb69b80830367703e93bb9da60b3455 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -314,8 +314,8 @@ them or perform system preparation operations.
Logical Volumes
---------------
-The program cannot work on LVM partitions [#f1]_. The input media may only
-contain primary or logical partitions.
+The program cannot work on input media that contain LVM partitions inside
+[#f1]_. The input media may only contain primary or logical partitions.
Para-virtualized drivers
------------------------
diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 36695266685b1667d231eda279ee8124e1a7bcd7..07df8d9c6ee10dd48a1aa352427e353d1db2674e 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -46,7 +46,7 @@ from kamaki.cli.config import Config
from kamaki.clients import ClientError
from kamaki.clients.image import ImageClient
from kamaki.clients.pithos import PithosClient
-from kamaki.clients.astakos import AstakosClient
+from kamaki.clients.astakos import CachedAstakosClient as AstakosClient
try:
config = Config()
diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index 7255f444c7b2f11c6a1b027756c539e2eab9f2e8..f29c752dd6687285fd1e4d577e1e75bf228426dd 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -46,7 +46,8 @@ class Unix(OSBase):
'.gnupg',
'.ssh',
'.kamakirc',
- '.kamaki.history'
+ '.kamaki.history',
+ '.kamaki.log'
]
def _mountpoints(self):
diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index 64757a6f5f93324bde5d1bf538d91015a67a3c63..f585dbdb88e7d92ae429d1aae10e3070206c83d4 100644
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -209,7 +209,8 @@ class Windows(OSBase):
"""Clear all the event logs"""
self._guest_exec(
- r"cmd /q /c for /f %l in ('wevtutil el') do wevtutil cl %l")
+ "cmd /q /c for /f \"tokens=*\" %l in ('wevtutil el') do "
+ "wevtutil cl \"%l\"")
@sysprep('Executing Sysprep on the image (may take more that 10 min)')
def microsoft_sysprep(self):
diff --git a/image_creator/version.py b/image_creator/version.py
index 069265b5bd2fa3f944f0a37dbf4c6bbf3a6ec5ca..ecc3557b9aab7760bfbb9410eddf2c400084e439 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,8 @@
-__version__ = "0.6"
+__version__ = "0.6.2"
__version_vcs_info__ = {
- 'branch': 'master',
- 'revid': '37d1ea1',
- 'revno': 426}
+ 'branch': 'hotfix-0.6.2',
+ 'revid': '73cec8b',
+ 'revno': 438}
__version_user_email__ = "skalkoto@grnet.gr"
__version_user_name__ = "Nikos Skalkotos"
diff --git a/image_creator/winexe.py b/image_creator/winexe.py
index b6c00bc3a5c30a96919d9bb40bd0e9282bb3042e..80bdea96587ec5b7c4f09d2ba49c6109d9a8a54d 100644
--- a/image_creator/winexe.py
+++ b/image_creator/winexe.py
@@ -38,7 +38,7 @@
import subprocess
import time
import signal
-import distutils
+from sh import which
from image_creator.util import FatalError
@@ -53,7 +53,7 @@ class WinEXE:
@staticmethod
def is_installed(program='winexe'):
- return distutils.spawn.find_executable(program) is not None
+ return which(program) is not None
def __init__(self, username, password, hostname, program='winexe'):
self._host = hostname
diff --git a/version b/version
index 5a2a5806df6e909afe3609b5706cb1012913ca0e..b6160487433ba524a39a93cde5a330f7e71d0d39 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6
+0.6.2