[trafficserver] branch 8.0.x updated: Runroot: Fix a issue caused by restructured headers

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new fb19938  Runroot: Fix a issue caused by restructured headers
fb19938 is described below

commit fb19938c3e22677683ab5f32abd5ebf8518f1d3e
Author: Xavier Chi <ch...@gmail.com>
AuthorDate: Thu Sep 13 13:38:32 2018 -0500

    Runroot: Fix a issue caused by restructured headers
    
    (cherry picked from commit 8134fc8552f838d571dd6b21fe707ca02ea2c112)
---
 src/traffic_layout/file_system.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/traffic_layout/file_system.cc b/src/traffic_layout/file_system.cc
index a1f0540..6b94034 100644
--- a/src/traffic_layout/file_system.cc
+++ b/src/traffic_layout/file_system.cc
@@ -243,7 +243,8 @@ ts_copy_function(const char *src_path, const struct stat *sb, int flag)
     }
     if (copy_dir == LAYOUT_INCLUDEDIR) {
       // check if include file is contained in atscppapi/ and ts/. If not, end the copying.
-      if (dst_path.find("/atscppapi/") == std::string::npos && dst_path.find("/ts/") == std::string::npos) {
+      if (dst_path.find("/atscppapi/") == std::string::npos && dst_path.find("/ts/") == std::string::npos &&
+          dst_path.find("/tscpp/") == std::string::npos) {
         break;
       }
     }