From: Tobias Geerinckx-Rice Date: Sun, 16 Jun 2019 02:34:10 +0200 Subject: [PATCH] gnu: dstat: Fix crash when specifying a delay. Taken verbatim from a pull request[0] that will never be merged. [0]: https://github.com/dagwieers/dstat/pull/167 From 220a785321b13b6df92a536080aca6ef1cb644ad Mon Sep 17 00:00:00 2001 From: Falko Goettsch Date: Mon, 11 Mar 2019 20:12:49 -0700 Subject: [PATCH] Fixed bug when specifying a delay The division in the 'loop' calculation in perform() was returning floating point values after the migration to Python 3, rather than rounding down. Changed to floor division. I think the floating point values kept 'loop == 0' from ever being true and the variables inside that conditional were never initialized, causing the following error when a delay other than 1 was specified: You did not select any stats, using -cdngy by default. Traceback (most recent call last): File "/home/falko/repos/dstat/dstat", line 2825, in main() File "/home/falko/repos/dstat/dstat", line 2684, in main scheduler.run() File "/home/falko/.conda/envs/python3/lib/python3.7/sched.py", line 151, in run action(*argument, **kwargs) File "/home/falko/repos/dstat/dstat", line 2729, in perform oldcols = cols NameError: name 'cols' is not defined --- dstat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dstat b/dstat index 9359965..3b4980f 100755 --- a/dstat +++ b/dstat @@ -2697,7 +2697,7 @@ def perform(update): starttime = time.time() - loop = (update - 1 + op.delay) / op.delay + loop = (update - 1 + op.delay) // op.delay step = ((update - 1) % op.delay) + 1 ### Get current time (may be different from schedule) for debugging nge
AgeCommit message (Expand)Author
2024-01-09tests: telephony: Fix VPATH builds....* gnu/tests/telephony.scm (%jami-account-content-sexp): New variable. Compute its value with `read` instead of using `include`. * gnu/tests/data/jami-dummy-account.dat (%jami-account-content-sexp): Remove variable. Make the file contain just the S-expression. Change-Id: I8d37aaf7b739f5f39715bfb8a9b8c9536385fd09 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Wojtek Kosior
2021-08-02Reinstate "services: Add a service for Jami."...This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below. Thanks to Christopher Baines for reporting the failure and proposing a fix. * guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data files via the 'extra-files' argument. * gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat file to... * gnu/local.mk (MODULES_NOT_COMPILED): ... here. Maxim Cournoyer
2021-08-02Revert "services: Add a service for Jami."...This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b. It broke 'guix pull'. Maxim Cournoyer
2021-08-02services: Add a service for Jami....* gnu/services/telephony.scm (string-or-computed-file?) (string-list?, account-fingerprint-list?): New procedures. (maybe-string-list, maybe-account-fingerprint-list) (maybe-boolean, maybe-string, jami-account-list): New configuration field types. (serialize-string-list, serialize-boolean, serialize-string) (jami-account, jami-account->alist, jami-configuration) (jami-account-list?, jami-account-list-maybe): New procedures. (%jami-accounts): New variable. (jami-configuration->command-line-arguments): New procedure. (jami-dbus-session-activation, jami-shepherd-services): New procedures. (jami-service-type): New variable. * gnu/build/jami-service.scm: New file. * gnu/tests/data/jami-dummy-account.dat: Likewise. * gnu/tests/telephony.scm: Likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Register them. * Makefile.am (SCM_TESTS): Register the test file. (dist_patch_DATA): Register the new data file. * doc/guix.texi (Telephony Services): Document it. Maxim Cournoyer