Merge lp:~alexeftimie/software-center/fix-runlocal-appinstall into lp:software-center

[Alex Eftimie]

set APP_INSTALL_PATH to build/share/app-install, so that run_local works without installing u-s-c in /usr/share

[lp:~alexeftimie/software-center/fix-runlocal-appinstall]

1799. By Michael Vogt on 2011-05-27

merged from lp:~alexeftimie/software-center/fix-runlocal-appinstall

=== modified file '.bzrignore'
--- .bzrignore	2011-03-02 23:27:46 +0000
+++ .bzrignore	2011-05-27 08:33:32 +0000
@@ -16,3 +16,4 @@
 data/xapian/spelling.DB
 data/xapian/spelling.baseA
 data/xapian/spelling.baseB
+build/
 
=== modified file 'run_local.sh'
--- run_local.sh	2011-03-14 10:59:35 +0000
+++ run_local.sh	2011-05-27 08:33:32 +0000
@@ -10,4 +10,9 @@
 
 # s-c
 export PYTHONPATH=$(pwd)
+
+if [ ! -d "./build" ]; then
+    echo "Please run: 'python setup.py build' before $0"
+fi
+
 ./software-center $@
 
=== modified file 'software-center'
--- software-center	2011-04-11 09:51:39 +0000
+++ software-center	2011-05-27 08:33:32 +0000
@@ -100,6 +100,8 @@
         xapian_base_path = datadir
         # set new global datadir
         softwarecenter.paths.datadir = datadir
+        # also alter the app-install path
+        softwarecenter.paths.APP_INSTALL_PATH = './build/share/app-install'
     else:
         datadir = softwarecenter.paths.datadir
         xapian_base_path = XAPIAN_BASE_PATH
 
=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2011-05-23 13:52:44 +0000
+++ softwarecenter/db/update.py	2011-05-27 08:33:32 +0000
@@ -57,7 +57,7 @@
                                   PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME,
                                   )
 from softwarecenter.paths import (SOFTWARE_CENTER_ICON_CACHE_DIR, 
-                                  APP_INSTALL_PATH)
+                                  APP_INSTALL_DESKTOP_PATH)
 from softwarecenter.db.database import parse_axi_values_file
 
 from locale import getdefaultlocale
@@ -343,7 +343,7 @@
     w = globals()["WEIGHT_DESKTOP_NAME"]
     term_generator.index_text_without_positions(name, w)
 
-def update(db, cache, datadir=APP_INSTALL_PATH):
+def update(db, cache, datadir=APP_INSTALL_DESKTOP_PATH):
     update_from_app_install_data(db, cache, datadir)
     update_from_var_lib_apt_lists(db, cache)
     # add db global meta-data
@@ -392,10 +392,10 @@
             index_app_info_from_parser(parser, db, cache)
     return True
         
-def update_from_app_install_data(db, cache, datadir=APP_INSTALL_PATH):
+def update_from_app_install_data(db, cache, datadir=APP_INSTALL_DESKTOP_PATH):
     """ index the desktop files in $datadir/desktop/*.desktop """
     context = glib.main_context_default()
-    for desktopf in glob(datadir+"/desktop/*.desktop"):
+    for desktopf in glob(datadir+"/*.desktop"):
         LOG.debug("processing %s" % desktopf)
         # process events
         while context.pending():