Hello community, here is the log from the commit of package dstat for openSUSE:Factory checked in at 2019-07-04 15:43:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dstat (Old) and /work/SRC/openSUSE:Factory/.dstat.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dstat" Thu Jul 4 15:43:04 2019 rev:9 rq:713079 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/dstat/dstat.changes 2019-06-13 23:03:15.591397941 +0200 +++ /work/SRC/openSUSE:Factory/.dstat.new.4615/dstat.changes 2019-07-04 15:43:05.574092469 +0200 @@ -1,0 +2,6 @@ +Tue Jul 2 14:28:44 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix CSV output, boo#1138417 + Add 0001-Use-python3-compatible-way-of-checking-instance-type.patch + +------------------------------------------------------------------- New: ---- 0001-Use-python3-compatible-way-of-checking-instance-type.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dstat.spec ++++++ --- /var/tmp/diff_new_pack.J9psWp/_old 2019-07-04 15:43:06.314093625 +0200 +++ /var/tmp/diff_new_pack.J9psWp/_new 2019-07-04 15:43:06.322093637 +0200 @@ -26,6 +26,8 @@ Source: https://github.com/dagwieers/dstat/archive/v%{version}.tar.gz Source1: dstat.desktop Patch1: fix_boo_1136279.patch +# PATCH-FIX-OPENSUSE - boo#1138417 +Patch2: 0001-Use-python3-compatible-way-of-checking-instance-type.patch BuildRequires: make Requires: python3 BuildArch: noarch @@ -52,9 +54,10 @@ %prep %setup -q -# repalce env by python +# replace env by python sed -i 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/python3/' dstat %patch1 -p1 +%patch2 -p1 %build @@ -88,8 +91,8 @@ %endif %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README.adoc TODO +%license COPYING +%doc AUTHORS ChangeLog README.adoc TODO %doc docs/*.html docs/*.adoc examples/ proc/ %{_bindir}/dstat %dir %{_datadir}/dstat ++++++ 0001-Use-python3-compatible-way-of-checking-instance-type.patch ++++++ >From 4afc0e352640bb278755beaab81cb2e935f5f1c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Tue, 2 Jul 2019 16:28:07 +0200 Subject: [PATCH] Use python3 compatible way of checking instance type Previously, "dstat --output file ..." failed on python3. --- dstat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dstat b/dstat index 9359965..df37911 100755 --- a/dstat +++ b/dstat @@ -541,12 +541,12 @@ class dstat: line = '' for i, name in enumerate(self.vars): - if isinstance(self.val[name], types.ListType) or isinstance(self.val[name], types.TupleType): + if isinstance(self.val[name], (list, type)): for j, val in enumerate(self.val[name]): line = line + printcsv(val) if j + 1 != len(self.val[name]): line = line + char['sep'] - elif isinstance(self.val[name], types.StringType): + elif isinstance(self.val[name], str): line = line + self.val[name] else: line = line + printcsv(self.val[name]) -- 2.22.0
