Change in vdsm[master]: caps: More readable and maintainable packages list

nsoffer at redhat.com nsoffer at redhat.com
Tue Aug 11 18:34:39 UTC 2015


Nir Soffer has uploaded a new change for review.

Change subject: caps: More readable and maintainable packages list
......................................................................

caps: More readable and maintainable packages list

Long lists that do not fit in one line are easier to work with when they
are formatted one item per line, and sorted. For example, diffs becomes
single line change, as can be seen in the next commit.

Change-Id: Ia6dbf19b3842be6cfaf20eec8ba7356493f08139
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M vdsm/caps.py
1 file changed, 17 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/44731/1

diff --git a/vdsm/caps.py b/vdsm/caps.py
index b443fab..450a58a 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -754,16 +754,15 @@
 
     if getos() in (OSName.RHEVH, OSName.OVIRT, OSName.FEDORA, OSName.RHEL,
                    OSName.POWERKVM):
-        KEY_PACKAGES = {'qemu-kvm': ('qemu-kvm', 'qemu-kvm-rhev',
-                                     'qemu-kvm-ev'),
-                        'qemu-img': ('qemu-img', 'qemu-img-rhev',
-                                     'qemu-img-ev'),
-                        'vdsm': ('vdsm',),
-                        'spice-server': ('spice-server',),
-                        'libvirt': ('libvirt', 'libvirt-daemon-kvm'),
-                        'mom': ('mom',),
-                        'librbd1': ('librbd1',),
-                        }
+        KEY_PACKAGES = {
+            'librbd1': ('librbd1',),
+            'libvirt': ('libvirt', 'libvirt-daemon-kvm'),
+            'mom': ('mom',),
+            'qemu-img': ('qemu-img', 'qemu-img-rhev', 'qemu-img-ev'),
+            'qemu-kvm': ('qemu-kvm', 'qemu-kvm-rhev', 'qemu-kvm-ev'),
+            'spice-server': ('spice-server',),
+            'vdsm': ('vdsm',),
+        }
 
         if _glusterEnabled:
             KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
@@ -788,9 +787,14 @@
             logging.error('', exc_info=True)
 
     elif getos() == OSName.DEBIAN and python_apt:
-        KEY_PACKAGES = {'qemu-kvm': 'qemu-kvm', 'qemu-img': 'qemu-utils',
-                        'vdsm': 'vdsmd', 'spice-server': 'libspice-server1',
-                        'libvirt': 'libvirt0', 'mom': 'mom'}
+        KEY_PACKAGES = {
+            'libvirt': 'libvirt0',
+            'mom': 'mom',
+            'qemu-img': 'qemu-utils',
+            'qemu-kvm': 'qemu-kvm',
+            'spice-server': 'libspice-server1',
+            'vdsm': 'vdsmd',
+        }
 
         if _glusterEnabled:
             KEY_PACKAGES.update(GLUSTER_DEB_PACKAGES)


-- 
To view, visit https://gerrit.ovirt.org/44731
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6dbf19b3842be6cfaf20eec8ba7356493f08139
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list