summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornecoro <>2007-06-18 11:25:28 +0000
committernecoro <>2007-06-18 11:25:28 +0000
commit095494f8811ee3667c82c4e2240df98558991b19 (patch)
tree128d428d783503dc43c4ecb63ee33a6738e03486
parent1c88fcd76019e0dee8202704892a38160408f346 (diff)
downloadportato-095494f8811ee3667c82c4e2240df98558991b19.tar.gz
portato-095494f8811ee3667c82c4e2240df98558991b19.tar.bz2
portato-095494f8811ee3667c82c4e2240df98558991b19.zip
fixed the listing of the ".svn" and "CVS" dirs
-rw-r--r--doc/Changelog1
-rw-r--r--portato/backend/portage/system.py8
-rw-r--r--portato/gui/qt/terminal.py6
3 files changed, 10 insertions, 5 deletions
diff --git a/doc/Changelog b/doc/Changelog
index b2757e7..f7a05ad 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@ next:
- added ebuild-viewer
- use optparse to parse cmdline options
- better config-handling
+- changed Qt-Terminal colors
0.7.4.2:
- bugfix in PortageSystem
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index 7c7d57e..50224a9 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -21,7 +21,10 @@ from portato.backend.system_interface import SystemInterface
class PortageSystem (SystemInterface):
"""This class provides access to the portage-system."""
-
+
+ # pre-compile the RE removing the ".svn" and "CVS" entries
+ unwantedPkgsRE = re.compile(r".*(\.svn|CVS)$")
+
def __init__ (self):
"""Constructor."""
self.settings = PortageSettings()
@@ -222,7 +225,8 @@ class PortageSystem (SystemInterface):
t += self.settings.vartree.dbapi.cp_all()
if name:
t = filter(self.find_lambda(name),t)
- t = unique_array(t)
+
+ t = filter(lambda x: not self.unwantedPkgsRE.match(x), unique_array(t))
if (withVersion):
t2 = []
diff --git a/portato/gui/qt/terminal.py b/portato/gui/qt/terminal.py
index 111588f..ff9d377 100644
--- a/portato/gui/qt/terminal.py
+++ b/portato/gui/qt/terminal.py
@@ -100,10 +100,10 @@ class QtConsole (Console, Qt.QTextEdit):
self.palette().setColor(Qt.QPalette.Base, Qt.QColor("black"))
self.setBackgroundRole(Qt.QPalette.Base)
self.setAutoFillBackground(True)
-
-
+
+ # set standard char format to "white"
self.stdFormat = self.currentCharFormat()
- self.stdFormat.merge(attr[30])
+ self.stdFormat.merge(ColorFormat("white"))
self.setCurrentCharFormat(self.stdFormat)
self.setReadOnly(True)