diff options
author | Ken Brown <kbrown@cornell.edu> | 2015-02-18 02:36:23 +0300 |
---|---|---|
committer | Ken Brown <kbrown@cornell.edu> | 2015-02-18 02:36:23 +0300 |
commit | 1415f18720397bd315ee94858578a97149dd5727 (patch) | |
tree | ad8b24b07560c26b7529cadf178d76d2dd0d8f25 /winsup/utils | |
parent | b61add26146f4eba4a58c7cf4830ad73d0255063 (diff) |
* dump_setup.cc (check_package_files): Accommodate postinstall
files in any directory whose name contains "/postinstall/", not
just /etc/postinstall.
Diffstat (limited to 'winsup/utils')
-rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
-rw-r--r-- | winsup/utils/dump_setup.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index a86aa55e9..e0e5ce3c2 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2015-02-17 Ken Brown <kbrown@cornell.edu> + + * dump_setup.cc (check_package_files): Accommodate postinstall + files in any directory whose name contains "/postinstall/", not + just /etc/postinstall. + 2015-02-03 Corinna Vinschen <corinna@vinschen.de> * regtool.cc (longopts): Add --force option. diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index 002c91d9f..d65beb624 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -396,7 +396,7 @@ check_package_files (int verbose, char *package) if (!directory_exists (verbose, filename, package)) result = false; } - else if (!strncmp (filename, "etc/postinstall/", 16)) + else if (strstr (filename, "/postinstall/")) { if (!file_exists (verbose, filename, ".done", package)) result = false; |