Merge "RIFT-14553: Datacenters are now listed under ro-accounts"

diff --git a/Makefile b/Makefile
index cf16aff..668bc8f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ RIFT_SHELL_EXE = $(TOP_ROOT_PATH)/rift-shell -b $(RIFT_BUILD) -i $(RIFT_INSTALL)
 CONFD = XML_ONLY
 
 BUILD_TYPE = Debug
-NOT_DEVELOPER_TYPE = TRUE
+NOT_DEVELOPER_TYPE = FALSE
 COVERAGE_BUILD = FALSE
 RIFT_AGENT_BUILD = $(CONFD)
 PROJECT_TOP_DIR = $(TOP_ROOT_PATH)
@@ -52,6 +52,9 @@ rw: cmake
 install:
        $(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD) install
 
+uninstall:
+       -xargs -i sh -c '[ -e {} ] && rm -fv {}' < $(RIFT_BUILD)/install_manifest.txt
+
 unittest:
        $(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD) rw.unittest
 

diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py
index 454546d..2436993 100644 (file)
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py
@@ -107,7 +107,7 @@ class PackageFilesystemStore(object):
         """
         if package_id not in self._package_dirs:
             msg = "Package %s not found in %s" % (package_id, self._root_dir)
-            raise PackageStoreError(msg)
+            raise PackageNotFoundError(msg)
 
         package_files = self._get_package_files(package_id)
         package_dir = self._get_package_dir(package_id)