From b91f14869867dc5e4158b73527d4bca26f20c938 Mon Sep 17 00:00:00 2001 From: Austin Cormier Date: Mon, 12 Sep 2016 16:26:48 -0400 Subject: [PATCH] Bug 40 - Fix export of user created descriptors Signed-off-by: Austin Cormier --- Makefile | 5 ++++- rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cf16aff8..668bc8f0 100644 --- 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 454546d2..24369936 100644 --- 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) -- 2.25.1