summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/zipinstaller.cpp6
-rw-r--r--rbutil/rbutilqt/base/zipinstaller.h6
-rw-r--r--rbutil/rbutilqt/gui/manualwidget.cpp2
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
4 files changed, 11 insertions, 5 deletions
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);
diff --git a/rbutil/rbutilqt/base/zipinstaller.h b/rbutil/rbutilqt/base/zipinstaller.h
index cb154c03a8..e15bbcf783 100644
--- a/rbutil/rbutilqt/base/zipinstaller.h
+++ b/rbutil/rbutilqt/base/zipinstaller.h
@@ -41,8 +41,10 @@ public:
void setUrl(QStringList url) { m_urllist = url; }
void setLogSection(QString name) {m_loglist = QStringList(name);}
void setLogSection(QStringList name) { m_loglist = name; }
- void setLogVersion(QString v) { m_verlist = QStringList(v); qDebug() << m_verlist;}
- void setLogVersion(QStringList v) { m_verlist = v; qDebug() << m_verlist;}
+ void setLogVersion(QString v = "")
+ { m_verlist = QStringList(v); qDebug() << m_verlist;}
+ void setLogVersion(QStringList v)
+ { m_verlist = v; qDebug() << m_verlist;}
void setUnzip(bool i) { m_unzip = i; }
void setTarget(QString t) { m_target = t; }
void setCache(QDir c) { m_cache = c; m_usecache = true; };
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp
index 3bc795f098..ae38980479 100644
--- a/rbutil/rbutilqt/gui/manualwidget.cpp
+++ b/rbutil/rbutilqt/gui/manualwidget.cpp
@@ -127,7 +127,7 @@ void ManualWidget::downloadManual(void)
}
qDebug() << "[ManualWidget] Manual URL:" << manualurl;
- installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString());
+ installer->setLogVersion();
installer->setUrl(manualurl);
installer->setUnzip(false);
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 5c496585ec..ae45068bde 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -994,7 +994,7 @@ void RbUtilQt::installDoom()
installer->setUrl(SystemInfo::value(SystemInfo::DoomUrl).toString());
installer->setLogSection("Game Addons");
- installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString());
+ installer->setLogVersion();
installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString());
if(!RbSettings::value(RbSettings::CacheDisabled).toBool())
installer->setCache(true);