Skip to content
Snippets Groups Projects
Commit c3ce3deb authored by Fons Rademakers's avatar Fons Rademakers
Browse files

From Gerri:

fix hiding warning and small memory leak.


git-svn-id: http://root.cern.ch/svn/root/trunk@29595 27541ba8-7e3a-0410-8455-c3a389f83636
parent c280ffc7
Branches
Tags
No related merge requests found
...@@ -358,17 +358,24 @@ Bool_t TAlienPackage::CheckDependencies () ...@@ -358,17 +358,24 @@ Bool_t TAlienPackage::CheckDependencies ()
fInstallList->Add (strObj); fInstallList->Add (strObj);
for (Int_t j = 0; j < fInstallList->GetEntries (); j++) { for (Int_t j = 0; j < fInstallList->GetEntries (); j++) {
TObjString *strObj = (TObjString *) fInstallList->At (j); strObj = (TObjString *) fInstallList->At(j);
TObjArray *strDepsPackgOrVer = strObj->GetString ().Tokenize ("::"); TString strObjPackage, strObjVersion;
TObjString *strObjPackage = (TObjString *) strDepsPackgOrVer->At (0); Int_t from = 0;
TObjString *strObjVersion = (TObjString *) strDepsPackgOrVer->At (1); if (strObj->GetString().Tokenize(strObjPackage, from, "::")) {
if (!strObj->GetString().Tokenize(strObjVersion, from, "::")) {
Warning("CheckDepencencies", "version string not found for j=%d (%s)", j, strObj->GetName());
continue;
}
} else {
Warning("CheckDepencencies", "package string not found for j=%d (%s)", j, strObj->GetName());
continue;
}
if (GetDebugLevel () > 2) if (GetDebugLevel () > 2)
Info ("CheckDepencencies", "\t[%d] Name=%s Version=%s", j, Info ("CheckDepencencies", "\t[%d] Name=%s Version=%s", j,
strObjPackage->GetString ().Data (), strObjPackage.Data(), strObjVersion.Data());
strObjVersion->GetString ().Data ());
if (CheckDirectories(strObjPackage->GetString (), strObjVersion->GetString ()) == kFALSE) if (CheckDirectories(strObjPackage, strObjVersion) == kFALSE)
return kFALSE; return kFALSE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment