From 968448c9cdd2583225cff015b43aeeb9d1c304da Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 23 May 2012 21:05:28 +0200 Subject: ZipIntaller: use file timestamp if version string is missing. Instead of using some arbitrary and not really useful string use the timestamp of the downloaded file if version string is provided by the caller. This also makes it possible to check if the downloaded file is actually a different one. Use it for manual and game file downloads, as this gives more reasonable values than using the date transmitted for daily (archived) build and as support for archived builds will be removed shortly. Change-Id: I0c751fabe7bb516edca93a5f73f077a611d4ef87 --- rbutil/rbutilqt/base/zipinstaller.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'rbutil/rbutilqt/base/zipinstaller.cpp') diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp index 3f3179f5f2..117fa2dae9 100644 --- a/rbutil/rbutilqt/base/zipinstaller.cpp +++ b/rbutil/rbutilqt/base/zipinstaller.cpp @@ -59,7 +59,7 @@ void ZipInstaller::installContinue() m_url = m_urllist.at(runner); m_logsection = m_loglist.at(runner); if(runner < m_verlist.size()) m_logver = m_verlist.at(runner); - else m_logver = "0"; + else m_logver = ""; installStart(); } else { @@ -176,6 +176,10 @@ void ZipInstaller::downloadDone(bool error) // add file to log zipContents.append(m_target); } + if(m_logver.isEmpty()) { + // if no version info is set use the timestamp of the server file. + m_logver = getter->timestamp().toString(Qt::ISODate); + } emit logItem(tr("Creating installation log"),LOGINFO); QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); -- cgit v1.2.3