fixed Fedora 25 python3-cryptography dependency, removed useless and codebreaking addition of op5Monitor stuff in authentication dialog (commit 050d98e) - now reauthentication works :-)

Henri Wahl · Henri Wahl · commit d12adca2195c · 2016-11-29T10:40:03.000+01:00
diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -58,7 +58,7 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '2.1-20161123'
+    VERSION = '2.1-20161129'
     WEBSITE = 'https://nagstamon.ifw-dresden.de'
     COPYRIGHT = '©2008-2016 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'
diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py
@@ -5740,17 +5740,6 @@ def initialize(self):
                 self.ui.input_lineedit_autologin_key.hide()
                 self.ui.label_autologin_key.hide()
 
-            if self.server.type == 'op5Monitor':
-                self.ui.input_lineedit_host_filter.show()
-                self.ui.input_lineedit_service_filter.show()
-                self.ui.label_service_filter.show()
-                self.ui.label_host_filter.show()
-            else:
-                self.ui.input_lineedit_host_filter.hide()
-                self.ui.input_lineedit_service_filter.hide()
-                self.ui.label_service_filter.hide()
-                self.ui.label_host_filter.hide()
-
             # set existing values
             self.ui.input_lineedit_username.setText(self.server.username)
             self.ui.input_lineedit_password.setText(self.server.password)
diff --git a/Nagstamon/resources/nagstamon.1.gz b/Nagstamon/resources/nagstamon.1.gz
diff --git a/build/build.py b/build/build.py
@@ -62,8 +62,7 @@ def winmain():
         VERSION_IS = VERSION
 
     print('VERSION_IS:', VERSION_IS)
-
-
+    
     ISCC = r'{0}{1}Inno Setup 5{1}iscc.exe'.format(os.environ['PROGRAMFILES{0}'.format(ARCH_OPTS[ARCH][2])], os.sep)
     DIR_BUILD_EXE = '{0}{1}exe.{2}-{3}'.format(CURRENT_DIR, os.sep, ARCH_OPTS[ARCH][0], PYTHON_VERSION)
     DIR_BUILD_NAGSTAMON = '{0}{1}Nagstamon-{2}-win{3}'.format(CURRENT_DIR, os.sep, VERSION, ARCH)
diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,4 +1,4 @@
-nagstamon (2.1-20161102) unstable; urgency=low
+nagstamon (2.1-20161129) unstable; urgency=low
   * New upstream
    - Development 'master' branch
    
diff --git a/build/redhat/nagstamon.spec b/build/redhat/nagstamon.spec
@@ -22,6 +22,7 @@ Requires:      python3-requests
 Requires:      python3-qt5
 Requires:      python3-SecretStorage
 Requires:      python3-crypto
+Requires:      python3-cryptography
 Requires:      python3-psutil
 Requires:      qt5-qtsvg
 Requires:      qt5-qtmultimedia
diff --git a/setup.py b/setup.py
@@ -108,6 +108,7 @@
         'python3-qt5 '
         'python3-SecretStorage '
         'python3-crypto '
+        'python3-cryptography '
         'python3-psutil '
         'qt5-qtsvg '
         'qt5-qtmultimedia ',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-nagstamon (2.1-20161102) unstable; urgency=low`
	`1`	`+nagstamon (2.1-20161129) unstable; urgency=low`
`2`	`2`	`* New upstream`
`3`	`3`	`- Development 'master' branch`
`4`	`4`