X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-uninstall.c;h=aa3faacb0c505956a9501524fb231ad2a112a750;hb=2a319cf90daa6e3b01e8139923f7073e1c9bcf28;hp=a89d86382092d9b567c34c45dcbfea2f9ccaec2b;hpb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-uninstall.c b/src/wgtpkg-uninstall.c
index a89d863..aa3faac 100644
--- a/src/wgtpkg-uninstall.c
+++ b/src/wgtpkg-uninstall.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015, 2016, 2017 IoT.bzh
+ Copyright (C) 2015-2019 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -24,10 +24,14 @@
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "verbose.h"
 #include "utils-dir.h"
 #include "secmgr-wrap.h"
+#include "wgtpkg-unit.h"
+#include "wgt.h"
+#include "wgt-info.h"
 
 /* uninstall the widget of idaver */
 int uninstall_widget(const char *idaver, const char *root)
@@ -37,6 +41,8 @@ int uninstall_widget(const char *idaver, const char *root)
 	char path[PATH_MAX];
 	const char *at;
 	int rc, rc2;
+	struct unitconf uconf;
+	struct wgt_info *ifo;
 
 	NOTICE("-- UNINSTALLING widget of id %s from %s --", idaver, root);
 
@@ -58,10 +64,22 @@ int uninstall_widget(const char *idaver, const char *root)
 		return -1;
 	}
 
+	/* removes the units */
+	ifo = wgt_info_createat(AT_FDCWD, path, 1, 1, 1);
+	if (!ifo) {
+		ERROR("can't read widget config in directory '%s': %m", path);
+		return -1;
+	}
+	uconf.installdir = path;
+	uconf.icondir = FWK_ICON_DIR;
+	uconf.port = 0;
+	unit_uninstall(ifo, &uconf);
+	wgt_info_unref(ifo);
+
 	/* removes the directory of the application */
 	rc = remove_directory(path, 1);
 	if (rc < 0) {
-		ERROR("error while removing directory '%s': %m", path);
+		ERROR("while removing directory '%s': %m", path);
 		return -1;
 	}
 
@@ -69,8 +87,8 @@ int uninstall_widget(const char *idaver, const char *root)
 	rc = snprintf(path, sizeof path, "%s/%s", FWK_ICON_DIR, idaver);
 	assert(rc < (int)sizeof path);
 	rc = unlink(path);
-	if (rc < 0)
-		ERROR("can't removing '%s': %m", path);
+	if (rc < 0 && errno != ENOENT)
+		ERROR("can't remove '%s': %m", path);
 
 	/* removes the parent directory if empty */
 	rc2 = snprintf(path, sizeof path, "%s/%s", root, id);
@@ -79,7 +97,7 @@ int uninstall_widget(const char *idaver, const char *root)
 	if (rc < 0 && errno == ENOTEMPTY)
 		return rc;
 	if (rc < 0) {
-		ERROR("error while removing directory '%s': %m", path);
+		ERROR("while removing directory '%s': %m", path);
 		return -1;
 	}