Merge "Clear data deletes too much" into jb-mr1-dev

2012-10-22 16:11:44 -07:00
parent 74437532fe 9157d3f3b7
commit e03c024471
1 changed files with 2 additions and 2 deletions
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -185,8 +185,8 @@ int delete_user_data(const char *pkgname, uid_t persona)
    if (create_pkg_path(pkgdir, pkgname, PKG_DIR_POSTFIX, persona))
        return -1;

-    /* delete contents AND directory, no exceptions */
-    return delete_dir_contents(pkgdir, 1, NULL);
+    /* delete contents, excluding "lib", but not the directory itself */
+    return delete_dir_contents(pkgdir, 0, "lib");
 }

 int make_user_data(const char *pkgname, uid_t uid, uid_t persona)