Fix for Registry object_names disappearing after a merge.

darcs-hash:20090508001259-f1522-5053df34b21c8b155a57592aea96caee2ee85a86.gz
anarchivist · May 8, 2009 · 700878c · 700878c
1 parent d402124
commit 700878c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/pyflag/Registry.py b/src/pyflag/Registry.py
@@ -308,6 +308,7 @@ def sort_function(x,y):
 
         self.classes.sort(sort_function)
         self.class_names = [ self.get_name(i) for i in self.classes ]
+        self.object_names = [ i.__dict__.get("name") for i in self.classes ]
         self.class_names_ex = [ self.get_class_name(i) for i in self.classes ]
         self.scanners = self.class_names
 

diff --git a/tests/pyflag b/tests/pyflag
@@ -6,6 +6,6 @@ INSTALL_DIR=/var/tmp/build/pyflag/
 
 ######### END CONFIGURATION ####################
 
-export PYTHONPATH=$SRC_DIR/src/pyflag:$SRC_DIR/src/:/usr/loca/lib/python2.6/site-packages/:$INSTALL_DIR/lib/python2.6/site-packages/pyflag
+export PYTHONPATH=$SRC_DIR/src/pyflag:$SRC_DIR/src/:/usr/loca/lib/python2.6/site-packages/:$INSTALL_DIR/lib/python2.6/site-packages/pyflag:/usr/loca/lib/python2.5/site-packages/:$INSTALL_DIR/lib/python2.5/site-packages/pyflag
 
-exec /usr/bin/python2.6 $SRC_DIR/src/pyflag/FlagHTTPServer.py --plugins=$SRC_DIR/src/plugins $@
+exec /usr/bin/python $SRC_DIR/src/pyflag/FlagHTTPServer.py --plugins=$SRC_DIR/src/plugins $@