ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
Subject: diskbackend: convert to long the calculated size
|
|
From: Pavel Hrdina phrdina@redhat.com Tue Oct 3 13:56:20 2017 +0200
|
|
Date: Thu Oct 19 09:06:44 2017 +0200:
|
|
Git: e73abe5a3acaa8e30363fb2ab8c9828b1fdb2589
|
|
|
|
If we convert to long the disk size, it may end up "0". The size is
|
|
in GiB so it can be "0.1".
|
|
|
|
Introduced by commit <fab55c128ff3f092039bb950ecfd337568d2a9a8>.
|
|
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
|
diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py
|
|
index 5979e6e6..de745f4d 100644
|
|
--- a/virtinst/diskbackend.py
|
|
+++ b/virtinst/diskbackend.py
|
|
@@ -389,7 +389,7 @@ class CloneStorageCreator(_StorageCreator):
|
|
msg = None
|
|
vfs = os.statvfs(os.path.dirname(self._path))
|
|
avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
|
- need = long(self._size) * long(1024) * long(1024) * long(1024)
|
|
+ need = long(self._size * 1024 * 1024 * 1024)
|
|
if need > avail:
|
|
if self._sparse:
|
|
msg = _("The filesystem will not have enough free space"
|
|
@@ -409,9 +409,8 @@ class CloneStorageCreator(_StorageCreator):
|
|
text = (_("Cloning %(srcfile)s") %
|
|
{'srcfile': os.path.basename(self._input_path)})
|
|
|
|
- size_bytes = (long(self.get_size()) *
|
|
- long(1024) * long(1024) * long(1024))
|
|
- progresscb.start(filename=self._output_path, size=long(size_bytes),
|
|
+ size_bytes = long(self.get_size() * 1024 * 1024 * 1024)
|
|
+ progresscb.start(filename=self._output_path, size=size_bytes,
|
|
text=text)
|
|
|
|
# Plain file clone
|