[Pkg-owncloud-commits] [owncloud-client] 107/211: Updater: allow overriding update URL through environment

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:33 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4525161e7c051aa63bcdc5166f7458a2fc564a24
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Oct 17 12:06:46 2014 +0200

    Updater: allow overriding update URL through environment
---
 src/updater/updater.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp
index f0dd465..c10efd7 100644
--- a/src/updater/updater.cpp
+++ b/src/updater/updater.cpp
@@ -80,7 +80,11 @@ QString Updater::getSystemInfo()
 // To test, cmake with -DAPPLICATION_UPDATE_URL="http://127.0.0.1:8080/test.rss"
 Updater *Updater::create()
 {
-    QUrl updateBaseUrl = addQueryParams(QUrl(QLatin1String(APPLICATION_UPDATE_URL)));
+    QUrl updateBaseUrl(QString::fromLocal8Bit(qgetenv("OCC_UPDATE_URL")));
+    if (updateBaseUrl.isEmpty()) {
+        updateBaseUrl = QUrl(QLatin1String(APPLICATION_UPDATE_URL));
+    }
+    updateBaseUrl = addQueryParams(updateBaseUrl);
 #if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
     updateBaseUrl.addQueryItem( QLatin1String("sparkle"), QLatin1String("true"));
     return new SparkleUpdater(updateBaseUrl.toString());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list