Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4de60b26 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Make lib dir before changing ownership of app dir" into jb-dev

parents 27db797e 4503cf67

cmds/installd/commands.c

+8 −5
Original line number Diff line number Diff line
@@ -53,11 +53,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
        unlink(pkgdir);

        return -errno;

    }

    if (chown(pkgdir, uid, gid) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(pkgdir);

        return -errno;

    }



    if (mkdir(libdir, 0755) < 0) {

        ALOGE("cannot create dir '%s': %s\n", libdir, strerror(errno));

        unlink(pkgdir);
@@ -75,6 +71,13 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
        unlink(pkgdir);

        return -errno;

    }



    if (chown(pkgdir, uid, gid) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libdir);

        unlink(pkgdir);

        return -errno;

    }

    return 0;

}