masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made updates method return types consistent

Browse Source 
Changed the return types of aptget and yaourt to (int, string) from (int, list)
to ensure consistency across all update backends and fixing the desktop
notification for available updates.
This commit is contained in:
Jonathan Tammo Siebert 2016-12-18 15:00:59 +01:00 committed by Jonathan Siebert
parent 9c21b61dee
commit 13ccf8895c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3pystatus/updates/aptget.py
View File

@ -23,9 +23,9 @@ class AptGet(Backend):
command = "apt-get upgrade -s -o Dir::State::Lists=" + cache_dir command = "apt-get upgrade -s -o Dir::State::Lists=" + cache_dir
apt = run_through_shell(command.split()) apt = run_through_shell(command.split())
out = apt.out.splitlines() out = apt.out.splitlines(True)
out = [line[5:] for line in out if line.startswith("Inst ")] out = "".join([line[5:] for line in out if line.startswith("Inst ")])
return len(out), out return out.count("\n"), out
Backend = AptGet Backend = AptGet

6
i3pystatus/updates/yaourt.py
View File

@ -14,8 +14,7 @@ class Yaourt(Backend):
status.register("updates", backends = \ status.register("updates", backends = \
[pacman.Pacman(), yaourt.Yaourt()]) [pacman.Pacman(), yaourt.Yaourt()])
If you want to count both pacman and aur packages with this module you can To count both pacman and aur packages, pass False in the constructor:
set the variable count_only_aur = False like this:
.. code-block:: python .. code-block:: python
@ -32,7 +31,8 @@ class Yaourt(Backend):
checkupdates = run_through_shell(command) checkupdates = run_through_shell(command)
out = checkupdates.out out = checkupdates.out
if(self.aur_only): if(self.aur_only):
out = [line for line in out if line.startswith("aur")] out = "".join([line for line in out.splitlines(True)
if line.startswith("aur")])
return out.count("\n"), out return out.count("\n"), out
Backend = Yaourt Backend = Yaourt