public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dstat/, sys-apps/dstat/files/
@ 2017-01-15 11:20 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2017-01-15 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     eeba0b01cdd645e0396ceb8aed3eaf3f8f10b635
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 11:05:53 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:20:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeba0b01

sys-apps/dstat: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/dstat/Manifest                            |  2 -
 sys-apps/dstat/dstat-0.6.9-r1.ebuild               | 44 --------------------
 sys-apps/dstat/dstat-0.7.2-r1.ebuild               | 48 ----------------------
 .../dstat/files/dstat-0.6.9-CVE-2009-3894.patch    | 15 -------
 4 files changed, 109 deletions(-)

diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 8da150f..01d1ba7 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,3 +1 @@
-DIST dstat-0.6.9.tar.bz2 74060 SHA256 edb2c17d081ee2b0b4fc2c57c2ed6dc36628853abd76c838026e99b3d1ea897c SHA512 59c7df7c0e1ea592591fecd66e96953c981a9b05dabbb33207f84b566b3fddda8ab5bc0bf9d8322ec64814a604dc34bedc53232c1e6dc2951906cbaf6a94a542 WHIRLPOOL 8caa06fb33daba80a4b9df99e53a874b9fe33b58c68c0c7a81a60f86ab29c170453137ae4a77dff806b2b7b187c0550efec6af56b44c5d05affb5aee20a18179
-DIST dstat-0.7.2.tar.bz2 85870 SHA256 34a986d9d7c028bd9dcb6b2ef1c740f7220de5c9cf976870a2b62aca23b33bae SHA512 276447c0f5492e4d2ac78f9f5b1d08e3565d26d02a7e6a22ef70f77b20f84d2b9ba806212860886139d401e4dfc2453c0dbc9ed82398ddec0ee75f5999080624 WHIRLPOOL 1f263026b137ac3f6bfb70d8840a52769505a6c55301607a4a6afae36fd084326922bf3f8edf5399df004a3d8f7dce165b5613e6729dc2944e8e6bf1674d2cb4
 DIST dstat-0.7.3.tar.gz 135583 SHA256 46e63821857b69fbc60cb2c7d893ccdd6f31cd9ef24b8bb0b68951e1c7374898 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2 WHIRLPOOL ad1b2c9647aae6f5002dd7474909c29ae7ca9bdb6efd10b42ce95b9b58f49406e9b13ed3863e4946166da34c597613751b314d5915886d349f916f2159559a6a

diff --git a/sys-apps/dstat/dstat-0.6.9-r1.ebuild b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
deleted file mode 100644
index 5f129b4..00000000
--- a/sys-apps/dstat/dstat-0.6.9-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit python eutils
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2009-3894.patch # 293497
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc \
-		AUTHORS ChangeLog README TODO \
-		examples/{mstat,read}.py docs/*.txt
-	dohtml docs/*.html
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/dstat
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/dstat
-}

diff --git a/sys-apps/dstat/dstat-0.7.2-r1.ebuild b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
deleted file mode 100644
index 3f93d84..00000000
--- a/sys-apps/dstat/dstat-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit python eutils
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="wifi"
-
-RDEPEND="wifi? ( net-wireless/python-wifi )"
-DEPEND=""
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	python_convert_shebangs 2 "${ED}usr/bin/dstat"
-
-	dodoc \
-		AUTHORS ChangeLog README TODO \
-		examples/{mstat,read}.py docs/*.txt
-	dohtml docs/*.html
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/dstat
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/dstat
-}

diff --git a/sys-apps/dstat/files/dstat-0.6.9-CVE-2009-3894.patch b/sys-apps/dstat/files/dstat-0.6.9-CVE-2009-3894.patch
deleted file mode 100644
index 042552b..00000000
--- a/sys-apps/dstat/files/dstat-0.6.9-CVE-2009-3894.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=293497
-
-Index: dstat-0.6.9/dstat
-===================================================================
---- dstat-0.6.9.orig/dstat
-+++ dstat-0.6.9/dstat
-@@ -28,8 +28,6 @@ try:
-     inspath('/usr/local/share/dstat/')
-     inspath('/usr/share/dstat/')
-     inspath(os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/')    # binary path + /plugins/
--    inspath(os.getcwd() + '/plugins/')                                      # current path + /plugins/
--    inspath(os.getcwd())                                                    # current path
-     inspath(os.path.expanduser('~/.dstat/'))                                # home + /.dstat/
- except KeyboardInterrupt, e:
-     pass


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dstat/, sys-apps/dstat/files/
@ 2020-09-19 12:29 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-09-19 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     b163fce18c1a70510f37ed89d932cc7426b990b9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 11:52:42 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 12:29:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b163fce1

sys-apps/dstat: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-apps/dstat/Manifest                            |  1 -
 sys-apps/dstat/dstat-0.7.3.ebuild                  | 39 --------------
 sys-apps/dstat/dstat-0.7.4-r1.ebuild               | 59 ----------------------
 sys-apps/dstat/dstat-0.7.4.ebuild                  | 52 -------------------
 .../files/dstat-0.7.3-skip-non-sandbox-tests.patch | 15 ------
 5 files changed, 166 deletions(-)

diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index ad77287898f..85f5131a910 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,2 +1 @@
-DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5

diff --git a/sys-apps/dstat/dstat-0.7.3.ebuild b/sys-apps/dstat/dstat-0.7.3.ebuild
deleted file mode 100644
index 372d70a1fd0..00000000000
--- a/sys-apps/dstat/dstat-0.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="wifi doc examples"
-REQUIRED_USE="wifi? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	wifi? (
-		${PYTHON_DEPS}
-		net-wireless/python-wifi
-	)"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" )
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	einstalldocs
-
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-	if use doc; then
-		dodoc docs/*.html
-	fi
-}

diff --git a/sys-apps/dstat/dstat-0.7.4-r1.ebuild b/sys-apps/dstat/dstat-0.7.4-r1.ebuild
deleted file mode 100644
index a5d6db02953..00000000000
--- a/sys-apps/dstat/dstat-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-r1
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples wifi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/six[${PYTHON_USEDEP}]
-	wifi? (
-		net-wireless/python-wifi
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( \
-	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" \
-	"${FILESDIR}/fix-collections-deprecation-warning.patch" \
-)
-
-src_prepare() {
-
-	# bug fix: allow delay to be specified
-	# backport from: https://github.com/dagwieers/dstat/pull/167/files
-	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
-
-	default
-}
-
-src_install() {
-	python_foreach_impl python_doscript dstat
-
-	insinto /usr/share/dstat
-	newins dstat dstat.py
-	doins plugins/dstat_*.py
-
-	doman docs/dstat.1
-
-	einstalldocs
-
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-	if use doc; then
-		dodoc docs/*.html
-	fi
-}

diff --git a/sys-apps/dstat/dstat-0.7.4.ebuild b/sys-apps/dstat/dstat-0.7.4.ebuild
deleted file mode 100644
index 43f33c42343..00000000000
--- a/sys-apps/dstat/dstat-0.7.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-r1
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples wifi"
-REQUIRED_USE="wifi? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	wifi? (
-		${PYTHON_DEPS}
-		net-wireless/python-wifi
-	)"
-DEPEND=""
-
-PATCHES=( \
-	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" \
-	"${FILESDIR}/fix-collections-deprecation-warning.patch" \
-)
-
-src_prepare() {
-
-	# bug fix: allow delay to be specified
-	# backport from: https://github.com/dagwieers/dstat/pull/167/files
-	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	einstalldocs
-
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-	if use doc; then
-		dodoc docs/*.html
-	fi
-}

diff --git a/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
deleted file mode 100644
index 48eb542ed19..00000000000
--- a/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile	2016-03-18 13:03:22.000000000 +0000
-+++ b/Makefile	2018-10-02 11:11:00.344942941 +0100
-@@ -32,9 +32,11 @@
- 	rm -f examples/*.pyc plugins/*.pyc
- 	$(MAKE) -C docs clean
- 
-+TEST_PLUGINS=--cpufreq --disk-avgqu --disk-avgrq --disk-svctm --disk-tps --disk-util --disk-wait --dstat-cpu --dstat-ctxt --dstat-mem --dstat --helloworld --md-status --net-packets --proc-count --snooze --test --top-bio-adv --top-bio --top-childwait --top-cpu-adv --top-cpu --top-cputime-avg --top-cputime --top-int --top-io-adv --top-io --top-latency-avg --top-latency --top-mem --top-oom
-+
- test:
- 	./dstat -taf 1 5
--	./dstat -t --all-plugins 1 5
-+	./dstat -t $(TEST_PLUGINS) 1 5
- 
- dist: clean
- 	$(MAKE) -C docs dist


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dstat/, sys-apps/dstat/files/
@ 2024-05-16 14:48 Arthur Zamarin
  0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2024-05-16 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c8cc7cd6f9359361823056fcab7d056ad40241a1
Author:     Paul Healy <lmiphay <AT> gmail <DOT> com>
AuthorDate: Sun May  5 14:02:54 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 16 14:48:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cc7cd6

sys-apps/dstat: enable py3.12, EAPI=8, refactor

Bug: https://bugs.gentoo.org/929807
Signed-off-by: Paul Healy <lmiphay <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36571
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-apps/dstat/dstat-0.7.4-r3.ebuild               |  60 ++++++++
 .../files/dstat-0.7.4-fix-backslash-in-regex.patch | 168 +++++++++++++++++++++
 2 files changed, 228 insertions(+)

diff --git a/sys-apps/dstat/dstat-0.7.4-r3.ebuild b/sys-apps/dstat/dstat-0.7.4-r3.ebuild
new file mode 100644
index 000000000000..a20659b9c3bd
--- /dev/null
+++ b/sys-apps/dstat/dstat-0.7.4-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-r1
+
+DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
+HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch"
+	"${FILESDIR}/fix-collections-deprecation-warning.patch"
+	"${FILESDIR}/dstat-0.7.4-fix-csv-output.patch"
+	"${FILESDIR}/dstat-${PV}-fix-backslash-in-regex.patch"
+)
+
+src_prepare() {
+	# bug fix: allow delay to be specified
+	# backport from: https://github.com/dagwieers/dstat/pull/167/files
+	sed -e 's; / op\.delay; // op.delay;' -i "dstat" || die
+
+	default
+}
+
+src_test() {
+	python_foreach_impl emake test
+}
+
+src_install() {
+	python_foreach_impl python_doscript dstat
+
+	insinto /usr/share/dstat
+	newins dstat dstat.py
+	doins plugins/dstat_*.py
+
+	doman docs/dstat.1
+
+	einstalldocs
+
+	if use examples; then
+		dodoc examples/{mstat,read}.py
+	fi
+	if use doc; then
+		dodoc docs/*.html
+	fi
+}

diff --git a/sys-apps/dstat/files/dstat-0.7.4-fix-backslash-in-regex.patch b/sys-apps/dstat/files/dstat-0.7.4-fix-backslash-in-regex.patch
new file mode 100644
index 000000000000..fbd6c836eb8f
--- /dev/null
+++ b/sys-apps/dstat/files/dstat-0.7.4-fix-backslash-in-regex.patch
@@ -0,0 +1,168 @@
+diff --git a/dstat b/dstat
+index 9359965..e26334a 100755
+--- a/dstat
++++ b/dstat
+@@ -755,7 +755,7 @@ class dstat_disk(dstat):
+     def __init__(self):
+         self.nick = ('read', 'writ')
+         self.type = 'b'
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 2
+ 
+@@ -841,7 +841,7 @@ class dstat_disk24(dstat):
+     def __init__(self):
+         self.nick = ('read', 'writ')
+         self.type = 'b'
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/partitions')
+         if self.fd and not self.discover:
+             raise Exception('Kernel has no per-partition I/O accounting [CONFIG_BLK_STATS], use at least 2.4.20')
+@@ -926,8 +926,8 @@ class dstat_disk24_old(dstat):
+     def __init__(self):
+         self.nick = ('read', 'writ')
+         self.type = 'b'
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+-        self.regexp = re.compile('^\((\d+),(\d+)\):\(\d+,\d+,(\d+),\d+,(\d+)\)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.regexp = re.compile(r'^\((\d+),(\d+)\):\(\d+,\d+,(\d+),\d+,(\d+)\)$')
+         self.open('/proc/stat')
+         self.cols = 2
+ 
+@@ -1178,7 +1178,7 @@ class dstat_io(dstat):
+         self.type = 'f'
+         self.width = 5
+         self.scale = 1000
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 2
+ 
+@@ -1324,7 +1324,7 @@ class dstat_net(dstat):
+     def __init__(self):
+         self.nick = ('recv', 'send')
+         self.type = 'b'
+-        self.totalfilter = re.compile('^(lo|bond\d+|face|.+\.\d+)$')
++        self.totalfilter = re.compile(r'^(lo|bond\d+|face|.+\.\d+)$')
+         self.open('/proc/net/dev')
+         self.cols = 2
+ 
+@@ -2329,7 +2329,7 @@ def getcpunr():
+ 
+     # Fallback 2
+     try:
+-        search = re.compile('^cpu\d+')
++        search = re.compile(r'^cpu\d+')
+         cpunr = 0
+         for line in dopen('/proc/stat').readlines():
+             if search.match(line):
+@@ -2346,14 +2346,14 @@ def blockdevices():
+ ### FIXME: Add scsi support too and improve
+ def sysfs_dev(device):
+     "Convert sysfs device names into device names"
+-    m = re.match('ide/host(\d)/bus(\d)/target(\d)/lun(\d)/disc', device)
++    m = re.match(r'ide/host(\d)/bus(\d)/target(\d)/lun(\d)/disc', device)
+     if m:
+         l = m.groups()
+         # ide/host0/bus0/target0/lun0/disc -> 0 -> hda
+         # ide/host0/bus1/target0/lun0/disc -> 2 -> hdc
+         nr = int(l[1]) * 2 + int(l[3])
+         return 'hd' + chr(ord('a') + nr)
+-    m = re.match('cciss/(c\dd\d)', device)
++    m = re.match(r'cciss/(c\dd\d)', device)
+     if m:
+         l = m.groups()
+         return l[0]
+diff --git a/plugins/dstat_disk_avgqu.py b/plugins/dstat_disk_avgqu.py
+index 5da8d46..6cf283f 100644
+--- a/plugins/dstat_disk_avgqu.py
++++ b/plugins/dstat_disk_avgqu.py
+@@ -11,7 +11,7 @@ class dstat_plugin(dstat):
+         self.type = 'f'
+         self.width = 4
+         self.scale = 10
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 1
+         self.struct = dict( rq_ticks=0 )
+diff --git a/plugins/dstat_disk_avgrq.py b/plugins/dstat_disk_avgrq.py
+index 1f2cd20..be25e17 100644
+--- a/plugins/dstat_disk_avgrq.py
++++ b/plugins/dstat_disk_avgrq.py
+@@ -12,7 +12,7 @@ class dstat_plugin(dstat):
+         self.type = 'f'
+         self.width = 4
+         self.scale = 10
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 1
+         self.struct = dict( nr_ios=0, rd_sect=0, wr_sect=0 )
+diff --git a/plugins/dstat_disk_svctm.py b/plugins/dstat_disk_svctm.py
+index 7a9a0f1..c88f0e0 100644
+--- a/plugins/dstat_disk_svctm.py
++++ b/plugins/dstat_disk_svctm.py
+@@ -15,7 +15,7 @@ class dstat_plugin(dstat):
+         self.type = 'f'
+         self.width = 4
+         self.scale = 1
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 1
+         self.struct = dict( nr_ios=0, tot_ticks=0 )
+diff --git a/plugins/dstat_disk_tps.py b/plugins/dstat_disk_tps.py
+index b58dbe8..d2acd78 100644
+--- a/plugins/dstat_disk_tps.py
++++ b/plugins/dstat_disk_tps.py
+@@ -12,7 +12,7 @@ class dstat_plugin(dstat):
+         self.type = 'd'
+         self.width = 5
+         self.scale = 1000
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 2
+ 
+diff --git a/plugins/dstat_disk_util.py b/plugins/dstat_disk_util.py
+index 2632c09..e0b292b 100644
+--- a/plugins/dstat_disk_util.py
++++ b/plugins/dstat_disk_util.py
+@@ -14,7 +14,7 @@ class dstat_plugin(dstat):
+         self.type = 'f'
+         self.width = 4
+         self.scale = 34
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 1
+         self.struct = dict( tot_ticks=0 )
+diff --git a/plugins/dstat_disk_wait.py b/plugins/dstat_disk_wait.py
+index 2b320b2..3f8d331 100644
+--- a/plugins/dstat_disk_wait.py
++++ b/plugins/dstat_disk_wait.py
+@@ -13,7 +13,7 @@ class dstat_plugin(dstat):
+         self.type = 'f'
+         self.width = 4
+         self.scale = 1
+-        self.diskfilter = re.compile('^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
++        self.diskfilter = re.compile(r'^([hsv]d[a-z]+\d+|cciss/c\d+d\d+p\d+|dm-\d+|md\d+|mmcblk\d+p\d0|VxVM\d+)$')
+         self.open('/proc/diskstats')
+         self.cols = 1
+         self.struct = dict( rd_ios=0, wr_ios=0, rd_ticks=0, wr_ticks=0 )
+diff --git a/plugins/dstat_net_packets.py b/plugins/dstat_net_packets.py
+index c3ef198..f7f34b7 100644
+--- a/plugins/dstat_net_packets.py
++++ b/plugins/dstat_net_packets.py
+@@ -10,7 +10,7 @@ class dstat_plugin(dstat):
+         self.type = 'd'
+         self.width = 5
+         self.scale = 1000
+-        self.totalfilter = re.compile('^(lo|bond\d+|face|.+\.\d+)$')
++        self.totalfilter = re.compile(r'^(lo|bond\d+|face|.+\.\d+)$')
+         self.open('/proc/net/dev')
+         self.cols = 2
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-05-16 14:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-19 12:29 [gentoo-commits] repo/gentoo:master commit in: sys-apps/dstat/, sys-apps/dstat/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2024-05-16 14:48 Arthur Zamarin
2017-01-15 11:20 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox