Mageia Bugzilla – Attachment 9757 Details for
Bug 21945
Update request: HPLIP 3.17.10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
hplip-disable-hp-upgrade-log-msg.patch
hplip-disable-hp-upgrade-log-msg.patch (text/plain), 5.84 KB, created by
Stig-Ørjan Smelror
on 2017-10-26 23:50:06 CEST
(
hide
)
Description:
hplip-disable-hp-upgrade-log-msg.patch
Filename:
MIME Type:
Creator:
Stig-Ørjan Smelror
Created:
2017-10-26 23:50:06 CEST
Size:
5.84 KB
patch
obsolete
>diff -Naur hplip-3.17.10.orig/ui/systemtray.py hplip-3.17.10/ui/systemtray.py >--- hplip-3.17.10.orig/ui/systemtray.py 2017-10-13 10:39:43.000000000 +0200 >+++ hplip-3.17.10/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 > > > >diff -Naur hplip-3.17.10.orig/ui4/systemtray.py hplip-3.17.10/ui4/systemtray.py >--- hplip-3.17.10.orig/ui4/systemtray.py 2017-10-13 10:41:12.000000000 +0200 >+++ hplip-3.17.10/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 > > > >diff -Naur hplip-3.17.10.orig/ui5/systemtray.py hplip-3.17.10/ui5/systemtray.py >--- hplip-3.17.10.orig/ui5/systemtray.py 2017-10-13 10:41:13.000000000 +0200 >+++ hplip-3.17.10/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 > > >
diff -Naur hplip-3.17.10.orig/ui/systemtray.py hplip-3.17.10/ui/systemtray.py --- hplip-3.17.10.orig/ui/systemtray.py 2017-10-13 10:39:43.000000000 +0200 +++ hplip-3.17.10/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 diff -Naur hplip-3.17.10.orig/ui4/systemtray.py hplip-3.17.10/ui4/systemtray.py --- hplip-3.17.10.orig/ui4/systemtray.py 2017-10-13 10:41:12.000000000 +0200 +++ hplip-3.17.10/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 diff -Naur hplip-3.17.10.orig/ui5/systemtray.py hplip-3.17.10/ui5/systemtray.py --- hplip-3.17.10.orig/ui5/systemtray.py 2017-10-13 10:41:13.000000000 +0200 +++ hplip-3.17.10/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
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 21945
: 9757