summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbionel <ionel.busuioc@gmail.com>2017-10-05 13:55:49 +0300
committerbionel <ionel.busuioc@gmail.com>2017-10-05 13:55:49 +0300
commitc06f8cfe0803b23e4851dd7e8beaf46af0c629a8 (patch)
treeb5b4abab85122df537214498ba07659717f592e0
parent4ab655b1474ebf93473b2aa5fd3791dad77f0526 (diff)
identify rebuilt packages, improve selects
-rwxr-xr-xsrc/frontend/gui/sisyphus-gui.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 5719ff9..61e0203 100755
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -147,28 +147,26 @@ class Sisyphus(QtWidgets.QMainWindow):
i.name AS pn,
a.version AS av,
i.version AS iv,
- i.description AS descr,
- CASE WHEN rm.name ISNULL THEN 'no' ELSE 'yes' END AS rmv
+ i.description AS descr
FROM local_packages AS i
LEFT JOIN remote_packages AS a
ON i.category = a.category
AND i.name = a.name
AND i.slot = a.slot
- LEFT JOIN removable_packages as rm
+ INNER JOIN removable_packages as rm
ON i.category = rm.category
AND i.name = rm.name
AND i.slot = rm.slot
WHERE %s LIKE %s
- AND rmv = "yes"
''' % (Sisyphus.SEARCHFIELD, Sisyphus.SEARCHTERM)),
('upgradable','''SELECT
i.category AS cat,
i.name AS pn,
- a.version AS av,
+ CASE WHEN a.version = i.version THEN 'Rebuilt' ELSE a.version END AS av,
i.version AS iv,
i.description AS descr
FROM local_packages AS i
- LEFT JOIN remote_packages AS a
+ INNER JOIN remote_packages AS a
ON i.category = a.category
AND i.name = a.name
AND i.slot = a.slot