X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-uninstall.c;h=f43583824311e7fa552e2fb49fc42c648180e847;hb=6008a3ec4d1c0ed5df338b7c5f0775585ab51cfb;hp=653aea729fb98ddd81aea093a4cc0e99af6e9f28;hpb=a9fb60ac4c40234fc3e1d183e3ec1bf98a02c48d;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-uninstall.c b/src/wgtpkg-uninstall.c index 653aea7..f435838 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 @@ -72,7 +72,8 @@ int uninstall_widget(const char *idaver, const char *root) } uconf.installdir = path; uconf.icondir = FWK_ICON_DIR; - uconf.port = 0; + uconf.new_afid = 0; + uconf.base_http_ports = 0; unit_uninstall(ifo, &uconf); wgt_info_unref(ifo); @@ -87,8 +88,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); @@ -97,7 +98,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; }