Forráskód Böngészése

HPCC-24784 wuget tries to fetch archive resource even if -a not specified

Also remove some spurious tracing.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 éve
szülő
commit
b692f28d2d
2 módosított fájl, 1 hozzáadás és 3 törlés
  1. 0 2
      common/dllserver/thorplugin.cpp
  2. 1 1
      tools/wuget/wuget.cpp

+ 0 - 2
common/dllserver/thorplugin.cpp

@@ -125,7 +125,6 @@ static bool getResourceFromMappedFile(const char * filename, const byte * start_
         }
     }
 
-    DBGLOG("Failed to extract resource %s: Does not include a matching entry", filename);
     return false;
 #else
     // The first bytes are the ELF header
@@ -166,7 +165,6 @@ static bool getResourceFromMappedFile(const char * filename, const byte * start_
         }
     }
 
-    DBGLOG("Failed to extract resource %s: Does not include a matching entry", filename);
     return false;
 #endif
 }

+ 1 - 1
tools/wuget/wuget.cpp

@@ -76,7 +76,7 @@ int main(int argc, char **argv)
                     if (xml.length())
                     {
                         Owned<ILocalWorkUnit> wu = createLocalWorkUnit(xml);
-                        if (getArchiveXMLFromFile(filename, xml.clear()))
+                        if (doArchive && getArchiveXMLFromFile(filename, xml.clear()))
                         {
                             Owned<IWUQuery> q = wu->updateQuery();
                             q->setQueryText(xml);