Now recognize local shm module

4 files changed, 24 insertions, 18 deletions

diff --git a/buildshm.sh b/buildshm.sh
new file mode 100755
index 0000000..e19a6ed
--- /dev/null
+++ b/buildshm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+python setup.py build_ext -i
+rm -rf build
diff --git a/doc/TODO b/doc/TODO
index fcaec74..6de180e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -32,17 +32,13 @@ Main Point: user preferences:
 - if a package has been merged, but there are still dependencies to be merged - move the dependencies up the tree (Updater)
 - use alternative way of displaying categories (tree-like - see Porthole)
 - move GUI prefs out of the system config
-
-GTK:
-----
 - make oneshot better
-- show dependencies
+- show reverse dependencies
 - reload package table when emerge is finished
-- dependency tree out of the installed packages
-
-Qt (stopped):
----
-- better terminal
-- find a way to use markup in CheckBoxes, Lists etc.
-- some hangups ...
-- color chooser for the ebuild hl-colors
+- show which package has a dependency that causes a block
+
+[quote]
+I would like to be able to see at a glance:
+1. How many packages I have installed. (Hopefully in the menubar)
+a. How many of the packages are installed, and the number there are in each category. (Just like you do with the queue: "x of y"::"installed of available")
+[/quote]
diff --git a/portato.py b/portato.py
index 3f94d25..c7cea74 100755
--- a/portato.py
+++ b/portato.py
@@ -75,10 +75,13 @@ def main ():
 		
 	else: # start us again in root modus and launch listener
 		
-		try:
-			import shm_wrapper as shm
+		try: # local version
+			from _shm import shm_wrapper as shm 
 		except ImportError:
-			from portato._shm import shm_wrapper as shm
+			try: # version installed together with portato
+				from portato._shm import shm_wrapper as shm 
+			except ImportError: # the normal shm module
+				import shm_wrapper as shm
 
 		mem = shm.create_memory(1024, permissions=0600)
 		sig = shm.create_semaphore(InitialValue = 0, permissions = 0600)
diff --git a/portato/plistener.py b/portato/plistener.py
index 2e35ccb..848e71e 100644
--- a/portato/plistener.py
+++ b/portato/plistener.py
@@ -91,10 +91,13 @@ class PListener (object):
 			self._sig = None
 			self._rw = None
 		else:
-			try:
-				import shm_wrapper as shm
+			try: # local version
+				from _shm import shm_wrapper as shm 
 			except ImportError:
-				from portato._shm import shm_wrapper as shm
+				try: # version installed together with portato
+					from portato._shm import shm_wrapper as shm 
+				except ImportError: # the normal shm module
+					import shm_wrapper as shm
 
 			self._mem = shm.SharedMemoryHandle(mem)
 			self._sig = shm.SemaphoreHandle(sig)