Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > 34d3007addba92609f3094d96935b9f6 > files > 34

hplip-3.22.10-4.mga9.src.rpm

--- hplip-3.17.10.orig/ui/systemtray.py	2017-10-13 10:39:43.000000000 +0200
+++ hplip-3.17.10.orig/ui/systemtray.py	2017-10-26 22:23:33.671507500 +0200
@@ -564,23 +564,26 @@ 
             return
 
 
-        current_time = time.time()
+        # Disable this check for Mageia so that is doesn't show up in the logs
+        # -kekePower
 
-        if int(current_time) > self.user_settings.upgrade_pending_update_time:
-            path = utils.which('hp-upgrade')
-            if path:
-                path = os.path.join(path, 'hp-upgrade')
-                log.debug("Running hp-upgrade: %s " % (path))
-                os.spawnlp(os.P_NOWAIT, path, 'hp-upgrade', '--notify')
-                time.sleep(5)
-            else:
-                log.error("Unable to find hp-upgrade --notify on PATH.")
-        else:
-            log.debug("upgrade schedule time is not yet completed. schedule time =%d current time =%d " %(self.user_settings.upgrade_pending_update_time, current_time))
-        try:
-            os.waitpid(0, os.WNOHANG)
-        except OSError:
-            pass
+        # current_time = time.time()
+
+        #if int(current_time) > self.user_settings.upgrade_pending_update_time:
+        #    path = utils.which('hp-upgrade')
+        #    if path:
+        #        path = os.path.join(path, 'hp-upgrade')
+        #        log.debug("Running hp-upgrade: %s " % (path))
+        #        os.spawnlp(os.P_NOWAIT, path, 'hp-upgrade', '--notify')
+        #        time.sleep(5)
+        #    else:
+        #        log.error("Unable to find hp-upgrade --notify on PATH.")
+        #else:
+        #    log.debug("upgrade schedule time is not yet completed. schedule time =%d current time =%d " %(self.user_settings.upgrade_pending_update_time, current_time))
+        #try:
+        #    os.waitpid(0, os.WNOHANG)
+        #except OSError:
+        #    pass
 
 
 
--- hplip-3.17.10.orig/ui4/systemtray.py	2017-10-13 10:41:12.000000000 +0200
+++ hplip-3.17.10.orig/ui4/systemtray.py	2017-10-26 22:24:59.285611020 +0200
@@ -410,25 +410,28 @@ 
 
             return
             
-            
-        current_time = time.time()
-    
-        if int(current_time) > self.user_settings.upgrade_pending_update_time:
-            path = utils.which('hp-upgrade')
-            if path:
-                path = os.path.join(path, 'hp-upgrade')
-                log.debug("Running hp-upgrade: %s " % (path))
-                os.spawnlp(os.P_NOWAIT, path, 'hp-upgrade', '--notify')
-                time.sleep(5)
-            else:
-                log.error("Unable to find hp-upgrade --notify on PATH.")
-        else:
-            log.debug("upgrade schedule time is not yet completed. schedule time =%d current time =%d " %(self.user_settings.upgrade_pending_update_time, current_time))
-        
-        try:
-            os.waitpid(0, os.WNOHANG)
-        except OSError:
-            pass
+
+        # Disable this check for Mageia so that is doesn't show up in the logs
+        # -kekePower
+
+        #current_time = time.time()
+        #
+        #if int(current_time) > self.user_settings.upgrade_pending_update_time:
+        #    path = utils.which('hp-upgrade')
+        #    if path:
+        #        path = os.path.join(path, 'hp-upgrade')
+        #        log.debug("Running hp-upgrade: %s " % (path))
+        #        os.spawnlp(os.P_NOWAIT, path, 'hp-upgrade', '--notify')
+        #        time.sleep(5)
+        #    else:
+        #        log.error("Unable to find hp-upgrade --notify on PATH.")
+        #else:
+        #    log.debug("upgrade schedule time is not yet completed. schedule time =%d current time =%d " %(self.user_settings.upgrade_pending_update_time, current_time))
+       # 
+       # try:
+       #     os.waitpid(0, os.WNOHANG)
+       # except OSError:
+       #     pass
 
 
 
--- hplip-3.17.10.orig/ui5/systemtray.py	2017-10-13 10:41:13.000000000 +0200
+++ hplip-3.17.10.orig/ui5/systemtray.py	2017-10-26 22:26:24.559737955 +0200
@@ -416,24 +416,27 @@ 
             return
 
 
-        current_time = time.time()
+        # Disable this check for Mageia so that is doesn't show up in the logs
+        # -kekePower
 
-        if int(current_time) > self.user_settings.upgrade_pending_update_time:
-            path = utils.which('hp-upgrade')
-            if path:
-                path = os.path.join(path, 'hp-upgrade')
-                log.debug("Running hp-upgrade: %s " % (path))
-                os.spawnlp(os.P_NOWAIT, path, 'hp-upgrade', '--notify')
-                time.sleep(5)
-            else:
-                log.error("Unable to find hp-upgrade --notify on PATH.")
-        else:
-            log.debug("upgrade schedule time is not yet completed. schedule time =%d current time =%d " %(self.user_settings.upgrade_pending_update_time, current_time))
-
-        try:
-            os.waitpid(0, os.WNOHANG)
-        except OSError:
-            pass
+        #current_time = time.time()
+        #
+        #if int(current_time) > self.user_settings.upgrade_pending_update_time:
+        #    path = utils.which('hp-upgrade')
+        #    if path:
+        #        path = os.path.join(path, 'hp-upgrade')
+        #        log.debug("Running hp-upgrade: %s " % (path))
+        #        os.spawnlp(os.P_NOWAIT, path, 'hp-upgrade', '--notify')
+        #        time.sleep(5)
+        #    else:
+        #        log.error("Unable to find hp-upgrade --notify on PATH.")
+        #else:
+        #    log.debug("upgrade schedule time is not yet completed. schedule time =%d current time =%d " %(self.user_settings.upgrade_pending_update_time, current_time))
+        #
+        #try:
+        #    os.waitpid(0, os.WNOHANG)
+        #except OSError:
+        #    pass