From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Sun, 4 Aug 2013 13:12:40 +0000 (+0300)
Subject: Fix version check introduced in aca3e6508c7ae3f5ee
X-Git-Tag: 0.5~1^2~1
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/981b450428a56442f3bd034d9e5c951f87117625?hp=419c8d7b894184d22fce332ab372ba5a8ebc2c5b

Fix version check introduced in aca3e6508c7ae3f5ee

The fix was backported to version 1.16.11
---

diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index a82f510..96efdab 100644
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -116,7 +116,7 @@ class Windows(OSBase):
         super(Windows, self).__init__(image, **kargs)
 
         # The commit with the following message was added in
-        # libguestfs 1.17.18:
+        # libguestfs 1.17.18 and was backported in version 1.16.11:
         #
         # When a Windows guest doesn't have a HKLM\SYSTEM\MountedDevices node,
         # inspection fails.  However inspection should not completely fail just
@@ -125,9 +125,11 @@ class Windows(OSBase):
         # Since Microsoft Sysprep removes the aforementioned key, image
         # creation for windows can only be supported if the installed guestfs
         # version is 1.17.18 or higher
-        if self.image.check_guestfs_version(1, 17, 18) < 0:
+        if self.image.check_guestfs_version(1, 17, 18) < 0 and \
+                (self.image.check_guestfs_version(1, 17, 0) >= 0 or
+                 self.image.check_guestfs_version(1, 16, 11) < 0):
             raise FatalError(
-                'For windows support libguestfs 1.17.18 or above is required')
+                'For windows support libguestfs 1.16.11 or above is required')
 
         device = self.image.g.part_to_dev(self.root)