#3 Add patch0 to disable outdated warning
Merged 2 years ago by madko. Opened 2 years ago by carlwgeorge.
rpms/ carlwgeorge/glances master  into  master

@@ -0,0 +1,31 @@ 

+ diff -Nurp glances-3.1.0.orig/glances/standalone.py glances-3.1.0/glances/standalone.py

+ --- glances-3.1.0.orig/glances/standalone.py	2019-12-22 14:16:39.845870773 -0600

+ +++ glances-3.1.0/glances/standalone.py	2019-12-22 14:17:29.059115003 -0600

+ @@ -29,7 +29,6 @@ from glances.stats import GlancesStats

+  from glances.outputs.glances_curses import GlancesCursesStandalone

+  from glances.outputs.glances_stdout import GlancesStdout

+  from glances.outputs.glances_stdout_csv import GlancesStdoutCsv

+ -from glances.outdated import Outdated

+  from glances.timer import Counter

+  

+  

+ @@ -92,9 +91,6 @@ class GlancesStandalone(object):

+              # Init screen

+              self.screen = GlancesCursesStandalone(config=config, args=args)

+  

+ -        # Check the latest Glances version

+ -        self.outdated = Outdated(config=config, args=args)

+ -

+      @property

+      def quiet(self):

+          return self._quiet

+ @@ -156,9 +152,3 @@ class GlancesStandalone(object):

+  

+          # 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")

file modified
+10 -2
@@ -3,12 +3,15 @@ 

  %{?python_enable_dependency_generator}

  Name:		glances	

  Version:	3.1.4.1

- Release:	2%{?dist}

+ Release:	3%{?dist}

  Summary:	CLI curses based monitoring tool

  

  License:	GPLv3

  URL:		https://github.com/nicolargo/glances

  Source0:	https://github.com/nicolargo/glances/archive/v%{version}.tar.gz

+ # disable warning that suggests updating via pip

+ # https://bugzilla.redhat.com/show_bug.cgi?id=1773662

+ Patch0:		disable-outdated-warning.patch

  BuildArch:	noarch

  BuildRequires:	python3-devel

  BuildRequires:	python3-setuptools
@@ -25,7 +28,9 @@ 

  It is developed in Python.

  

  %prep

- %autosetup -n %{name}-%{version}

+ %autosetup -n %{name}-%{version} -p 1

+ # related to patch0

+ rm glances/outdated.py

  

  %build

  %py3_build
@@ -47,6 +52,9 @@ 

  

  

  %changelog

+ * Wed May 27 2020 Carl George <carl@george.computer> - 3.1.4.1-3

+ - Add patch0 to disable outdated warning rhbz#1773662

+ 

  * Tue May 26 2020 Miro HronĨok <mhroncok@redhat.com> - 3.1.4.1-2

  - Rebuilt for Python 3.9

  

@madko, can you please take a look at this?

rebased onto 0de575c

2 years ago

rebased onto c033a5d

2 years ago

Pull-Request has been merged by madko

2 years ago

Sorry trying to revert this I've lost some commit. And it seems that builds have been lunched I was not aware of. Trying to making it right with release 3.1.4.1-2. It seems there is already a -3 in rawhide, how to fix that ?

Sorry trying to revert this I've lost some commit.

Why would you merge this just to revert it minutes later? What commit did you lose?

And it seems that builds have been lunched I was not aware of.

Proven packagers can make changes and create builds without your permission. It is up to you to make sure you have pulled down the latest commits before making your own changes.

Trying to making it right with release 3.1.4.1-2. It seems there is already a -3 in rawhide, how to fix that ?

Before your commits today, here are the last few releases.

3.1.4.1-1: @hobbes1069's update to upstream 3.1.4.1 (rawhide build)
3.1.4.1-2: @churchyard's release bump for the Python 3.9 rebuild (f33-python build)
3.1.4.1-3: my proposed changes in this pull request (not built)

Currently rawhide builds should be made against the f33-python build target.

https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/24UMFCUXDERAP5KAU3QMWQRKOVLSBSJR/

Now you've deleted several changelog entries in the spec file and added a text file to the look aside cache. This is kind of a mess. Would you like to add me as a co-maintainer to sort it out?

Well I first trusted the merge request and then realized that there were an even easier way to fix the problem by just adding a config file.
I don't lost commit, but I guess I've overwritten some commit changes (from the changelog). Those from the merge I reverted. Not a big mess. But thanks for your help anyway. I thought I had put the changelog back, but you blocked the updates in bodhi, so I will check this again soon.