From f4dea17c19d9074cd3be28156a107cbda1372cda Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 31 Jul 2016 14:55:36 +0300 Subject: [PATCH] Merge "housekeeping: Switch to pytho2 and handle version" from Amnon This series handle two issues: * Moving to python2, though python3 is supported, there are modules that we need that are not rpm installable, python3 would wait when it will be more mature. * Check version should send the current version when it check for a new one and a simple string compare is wrong. (cherry picked from commit ec62f0d321f0e7fd72fc85030573deffa7947953) --- dist/redhat/scylla.spec.in | 2 +- dist/ubuntu/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/redhat/scylla.spec.in b/dist/redhat/scylla.spec.in index 272e364b5f..7407a6a792 100644 --- a/dist/redhat/scylla.spec.in +++ b/dist/redhat/scylla.spec.in @@ -30,7 +30,7 @@ URL: http://www.scylladb.com/ BuildRequires: libaio-devel libstdc++-devel cryptopp-devel hwloc-devel numactl-devel libpciaccess-devel libxml2-devel zlib-devel thrift-devel yaml-cpp-devel lz4-devel snappy-devel jsoncpp-devel systemd-devel xz-devel openssl-devel libcap-devel libselinux-devel libgcrypt-devel libgpg-error-devel elfutils-devel krb5-devel libcom_err-devel libattr-devel pcre-devel elfutils-libelf-devel bzip2-devel keyutils-libs-devel xfsprogs-devel make gnutls-devel systemd-devel lksctp-tools-devel %{?fedora:BuildRequires: boost-devel ninja-build ragel antlr3-tool antlr3-C++-devel python3 gcc-c++ libasan libubsan python3-pyparsing dnf-yum} %{?rhel:BuildRequires: scylla-libstdc++-static scylla-boost-devel scylla-ninja-build scylla-ragel scylla-antlr3-tool scylla-antlr3-C++-devel python34 scylla-gcc-c++ >= 5.1.1, python34-pyparsing} -Requires: scylla-conf systemd-libs hwloc collectd PyYAML python-urwid +Requires: scylla-conf systemd-libs hwloc collectd PyYAML python-urwid python-pyparsing python-requests Conflicts: abrt %description server diff --git a/dist/ubuntu/control.in b/dist/ubuntu/control.in index 6b55bcf6ad..7b693379e6 100644 --- a/dist/ubuntu/control.in +++ b/dist/ubuntu/control.in @@ -16,7 +16,7 @@ Conflicts: scylla-server (<< 1.1) Package: scylla-server Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, hwloc-nox, collectd, scylla-conf, python-yaml, python-urwid, python3-requests, @@DEPENDS@@ +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, hwloc-nox, collectd, scylla-conf, python-yaml, python-urwid, python-requests, @@DEPENDS@@ Description: Scylla database server binaries Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB.