From 1415f18720397bd315ee94858578a97149dd5727 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Tue, 17 Feb 2015 23:36:23 +0000 Subject: [PATCH] * dump_setup.cc (check_package_files): Accommodate postinstall files in any directory whose name contains "/postinstall/", not just /etc/postinstall. --- winsup/utils/ChangeLog | 6 ++++++ winsup/utils/dump_setup.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * 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 * 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;