From fe186d6112b30aa6e1c21f76d536f9e803ed1a5b Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 26 Jan 2023 00:44:50 +0530 Subject: [PATCH] glances: update to 3.3.1.1. Adopt. --- srcpkgs/glances/patches/no-check-update.patch | 52 +++++++++++-------- srcpkgs/glances/template | 8 +-- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/srcpkgs/glances/patches/no-check-update.patch b/srcpkgs/glances/patches/no-check-update.patch index 7b334f1551ff..1487ab0b3bdc 100644 --- a/srcpkgs/glances/patches/no-check-update.patch +++ b/srcpkgs/glances/patches/no-check-update.patch @@ -1,24 +1,30 @@ ---- a/glances/main.py -+++ b/glances/main.py -@@ -97,6 +97,7 @@ - """Manage the command line arguments.""" - # Read the command line arguments - self.args = self.parse_args() -+ self.args.disable_check_update = False +Description: Disable nagging suggestion to upgrade using pip +Author: Sebastien Badia +Bug-Debian: https://bugs.debian.org/877127 + +--- a/glances/standalone.py ++++ b/glances/standalone.py +@@ -103,9 +103,6 @@ + # Init screen + self.screen = GlancesCursesStandalone(config=config, args=args) - def init_args(self): - """Init all the command line arguments.""" -@@ -514,13 +515,6 @@ - ) - # Globals options - parser.add_argument( -- '--disable-check-update', -- action='store_true', -- default=False, -- dest='disable_check_update', -- help='disable online Glances version ckeck', -- ) -- parser.add_argument( - '--strftime', - dest='strftime_format', - default='', +- # Check the latest Glances version +- self.outdated = Outdated(config=config, args=args) +- + @property + def quiet(self): + return self._quiet +@@ -184,12 +181,3 @@ + + # Exit from export modules + self.stats.end() +- +- # Check Glances version versus PyPI one +- if self.outdated.is_outdated(): +- print( +- "You are using Glances version {}, however version {} is available.".format( +- self.outdated.installed_version(), self.outdated.latest_version() +- ) +- ) +- print("You should consider upgrading using: pip install --upgrade glances") + diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index d9ad47ccd85e..ace5c3b674ad 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -1,18 +1,18 @@ # Template file for 'glances' pkgname=glances -version=3.3.0.4 +version=3.3.1.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-future python3-psutil python3-defusedxml python3-packaging" +depends="python3-psutil python3-defusedxml python3-packaging python3-ultrajson" checkdepends="$depends" short_desc="Cross-platform curses-based monitoring tool" -maintainer="Orphaned " +maintainer="icp " license="LGPL-3.0-or-later" homepage="https://nicolargo.github.io/glances/" changelog="https://raw.githubusercontent.com/nicolargo/glances/develop/NEWS.rst" distfiles="https://github.com/nicolargo/glances/archive/refs/tags/v${version}.tar.gz" -checksum=464905c9b4806b80782eb8e43552ccbfa346d6f905f8a2d28de48613ccba0e53 +checksum=450c604ddfe05398ec88bd237648c7d851ad3c537b5f785eccafab4e9789c235 post_install() { vsconf conf/glances.conf