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
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
Subject: Remove deprecated statvfs module
|
|
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:35:47 2017 +0100
|
|
Date: Fri Oct 20 11:49:14 2017 -0400:
|
|
Git: dff00d4fc02aa88036d0c7aa13324276fe08f14f
|
|
|
|
The statvfs module has been removed in Python 3. [1]
|
|
It is replaced by os.statvfs which is also available in Pyhton 2.
|
|
|
|
[1] https://docs.python.org/2/library/statvfs.html#module-statvfs
|
|
[2] https://docs.python.org/3/library/os.html#os.statvfs
|
|
|
|
diff --git a/virtManager/addstorage.py b/virtManager/addstorage.py
|
|
index cdfd78e1..c137e2b3 100644
|
|
--- a/virtManager/addstorage.py
|
|
+++ b/virtManager/addstorage.py
|
|
@@ -19,7 +19,6 @@
|
|
|
|
import logging
|
|
import os
|
|
-import statvfs
|
|
|
|
from gi.repository import GObject
|
|
from gi.repository import Gtk
|
|
@@ -81,7 +80,7 @@ class vmmAddStorage(vmmGObjectUI):
|
|
|
|
elif not self.conn.is_remote() and os.path.exists(path):
|
|
vfs = os.statvfs(os.path.dirname(path))
|
|
- avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
|
+ avail = vfs.f_frsize * vfs.f_bavail
|
|
|
|
return float(avail / 1024.0 / 1024.0 / 1024.0)
|
|
|
|
diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py
|
|
index a08a23e5..636aa51f 100644
|
|
--- a/virtinst/diskbackend.py
|
|
+++ b/virtinst/diskbackend.py
|
|
@@ -22,7 +22,6 @@ import logging
|
|
import os
|
|
import re
|
|
import stat
|
|
-import statvfs
|
|
|
|
import libvirt
|
|
|
|
@@ -391,7 +390,7 @@ class CloneStorageCreator(_StorageCreator):
|
|
avail = _stat_disk(self._path)[1]
|
|
else:
|
|
vfs = os.statvfs(os.path.dirname(self._path))
|
|
- avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
|
+ avail = vfs.f_frsize * vfs.f_bavail
|
|
need = long(self._size * 1024 * 1024 * 1024)
|
|
if need > avail:
|
|
if self._sparse:
|