Kaynağa Gözat

fixed: userExcludeFile is read again

Wolfgang Ortmann 9 yıl önce
ebeveyn
işleme
337817cade
2 değiştirilmiş dosya ile 10 ekleme ve 9 silme
  1. 7 7
      src/excludetools.cpp
  2. 3 2
      src/kind.ag

+ 7 - 7
src/excludetools.cpp

@@ -34,11 +34,11 @@ Strings getExclusions(const KindConfig& conf)
           int rc;
           Strings excludedFiles = remoteExec(rshCommand, cmd, rc, debug);
           /*
-                if (rc > 0)
-                  {
-                    // return Strings should contain error messages
-                    throw Exception("Find excludes", "Search for excludes failed");
-                  }
+	    if (rc > 0)
+	    {
+	    // return Strings should contain error messages
+	    throw Exception("Find excludes", "Search for excludes failed");
+	    }
           */
           for (unsigned int i = 0; i < excludedFiles.size(); ++i)
             {
@@ -47,7 +47,7 @@ Strings getExclusions(const KindConfig& conf)
               debugPrint("Excluding: " + exclusions.back());
             }
         }
-      /*
+      
       string userExcludeFile = conf.getString("userExcludeFile");
       if (!userExcludeFile.empty())
         {
@@ -60,7 +60,7 @@ Strings getExclusions(const KindConfig& conf)
           if (rc == 0)
             exclusions += excludes2;
         } // if (shellMode)
-      */
+      
     }
   return exclusions;
 }

+ 3 - 2
src/kind.ag

@@ -193,12 +193,13 @@ void readVaultConfig(const string& vault, KindConfig& conf)
     conf.setBool("useBackupSet", true);
   else
     conf.setBool("useBackupSet", false);
-
+  /*
   if (conf.hasKey("userExcludeFile"))
     {
-      string userExcludeCommand = "cat " + conf.getString("userExcludeFile");
+      string userExcludeCommand = "cat %path/" + conf.getString("userExcludeFile");
       conf.addString("userExcludeCommand", userExcludeCommand);
     }
+  */
 }
 
 string getImageName(const KindConfig& conf,