Skip to content

Commit ed128d5

Browse files
committed
Log filelist URL to download in --verbose mode.
Also rename from "master file" to "update filelist"
1 parent 10b486c commit ed128d5

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/s25update.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,12 @@ void executeUpdate(int argc, char* argv[])
644644
const auto possibleBases = getPossibleHttpBases(nightly);
645645
for(size_t i = 0; i < possibleBases.size(); i++)
646646
{
647-
auto filelistOpt = DownloadFile(possibleBases[i] + FILELIST);
647+
const std::string url = possibleBases[i] + FILELIST;
648+
if(verbose)
649+
bnw::cout << "Trying to download update filelist from '" << url << '"' << std::endl;
650+
auto filelistOpt = DownloadFile(url);
648651
if(!filelistOpt)
649-
bnw::cout << "Warning: Was not able to get masterfile " << i << ", trying older one" << std::endl;
652+
bnw::cout << "Warning: Was not able to get update filelist " << i << ", trying older one" << std::endl;
650653
else
651654
{
652655
filelist = *filelistOpt;
@@ -655,7 +658,7 @@ void executeUpdate(int argc, char* argv[])
655658
}
656659
}
657660
if(filelist.empty())
658-
throw std::runtime_error("Could not get any master file");
661+
throw std::runtime_error("Could not get any update filelist");
659662

660663
// httpbase now includes targetpath and filepath
661664

0 commit comments

Comments
 (0)