diff options
author | B. Stack <bgstack15@gmail.com> | 2021-05-10 10:13:05 -0400 |
---|---|---|
committer | B. Stack <bgstack15@gmail.com> | 2021-05-10 10:13:05 -0400 |
commit | 7d691c8ea3ced80202007f3e18a92531d366e70e (patch) | |
tree | 52cd04c1c57ead1f0a15a20dd1528a1155bc022c /freefilesync/debian/patches/ffs_no_check_updates.patch | |
parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
download | stackrpms-7d691c8ea3ced80202007f3e18a92531d366e70e.tar.gz stackrpms-7d691c8ea3ced80202007f3e18a92531d366e70e.tar.bz2 stackrpms-7d691c8ea3ced80202007f3e18a92531d366e70e.zip |
WIP: ffs dpkg all patches work
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_check_updates.patch')
-rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index d90bf7d..00cfb2b 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -1,3 +1,4 @@ +Version: 11.10 diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/main_dlg.cpp 11.4-1/FreeFileSync/Source/ui/main_dlg.cpp --- 11.4-0/FreeFileSync/Source/ui/main_dlg.cpp 2020-12-08 08:15:29.432156507 -0500 +++ 11.4-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-12-08 18:29:47.210277596 -0500 @@ -57,16 +58,17 @@ diff -aur 11.7-0/FreeFileSync/Source/ui/version_check.cpp 11.7-1/FreeFileSync/So } catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); } -@@ -178,8 +179,7 @@ +@@ -182,8 +183,8 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { - const std::string response = sendHttpPost(Zstr("https://api.freefilesync.org/latest_version"), postParams, - ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError + const std::string response = ""; - return trimCpy(response); - } ++ return trimCpy(response); + if (response.empty() || + !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) || @@ -226,13 +226,13 @@ const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError lastOnlineVersion = onlineVersion; |