Przeglądaj źródła

HPCC-8777 - Allow ecl packagemap delete and activate to work properly

Remove using "process" when looking up the PackageSet information
as recommended by code review

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
Stuart Ort 12 lat temu
rodzic
commit
6c57c11bc3

+ 2 - 2
esp/services/ws_packageprocess/ws_packageprocessService.cpp

@@ -376,7 +376,7 @@ bool deletePkgInfo(const char *packageMap, const char *target, const char *proce
 
     StringBuffer pkgSetId;
     buildPkgSetId(pkgSetId, process);
-    VStringBuffer pkgSet_xpath("PackageSet[@id='%s'][@process='%s']", pkgSetId.str(), process);
+    VStringBuffer pkgSet_xpath("PackageSet[@id='%s']", pkgSetId.str());
     IPropertyTree *pkgSetRegistry = packageSets->queryPropTree(pkgSet_xpath.str());
     if (!pkgSetRegistry)
         throw MakeStringException(PKG_TARGET_NOT_DEFINED, "No package sets defined for %s", process);
@@ -425,7 +425,7 @@ void activatePackageMapInfo(const char *target, const char *packageMap, const ch
 
     StringBuffer pkgSetId;
     buildPkgSetId(pkgSetId, process);
-    VStringBuffer pkgSet_xpath("PackageSet[@id='%s'][@process='%s']", pkgSetId.str(), process);
+    VStringBuffer pkgSet_xpath("PackageSet[@id='%s']", pkgSetId.str());
     IPropertyTree *pkgSetTree = root->queryPropTree(pkgSet_xpath.str());
     if (pkgSetTree)
     {