diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-08-09 10:57:33 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-08-09 10:57:33 +0000 |
commit | 63ba647ee0fcdcb42f1e36e4a8f82c6c40cbb8f2 (patch) | |
tree | b13d4c5767f8b084d78cc0598cc4abe4cdc8a6ea /rbutil/rbutilqt/base/bootloaderinstallfile.cpp | |
parent | 7aaa544f09ae2f2cf0cd64cbd3f72c0714a94eba (diff) | |
download | rockbox-63ba647ee0fcdcb42f1e36e4a8f82c6c40cbb8f2.tar.gz rockbox-63ba647ee0fcdcb42f1e36e4a8f82c6c40cbb8f2.zip |
Clean up bootloader installation debug output a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22219 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/bootloaderinstallfile.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallfile.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp index 0c12b05253..0db39a5be3 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp | |||
@@ -33,7 +33,7 @@ BootloaderInstallFile::BootloaderInstallFile(QObject *parent) | |||
33 | bool BootloaderInstallFile::install(void) | 33 | bool BootloaderInstallFile::install(void) |
34 | { | 34 | { |
35 | emit logItem(tr("Downloading bootloader"), LOGINFO); | 35 | emit logItem(tr("Downloading bootloader"), LOGINFO); |
36 | qDebug() << __func__; | 36 | qDebug() << "[BootloaderInstallFile] installing bootloader"; |
37 | downloadBlStart(m_blurl); | 37 | downloadBlStart(m_blurl); |
38 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 38 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); |
39 | return true; | 39 | return true; |
@@ -48,7 +48,7 @@ void BootloaderInstallFile::installStage2(void) | |||
48 | QString fwfile(resolvePathCase(m_blfile)); | 48 | QString fwfile(resolvePathCase(m_blfile)); |
49 | if(!fwfile.isEmpty()) { | 49 | if(!fwfile.isEmpty()) { |
50 | QString moved = resolvePathCase(m_blfile) + ".ORIG"; | 50 | QString moved = resolvePathCase(m_blfile) + ".ORIG"; |
51 | qDebug() << "renaming" << fwfile << "->" << moved; | 51 | qDebug() << "[BootloaderInstallFile] renaming" << fwfile << "to" << moved; |
52 | QFile::rename(fwfile, moved); | 52 | QFile::rename(fwfile, moved); |
53 | } | 53 | } |
54 | 54 | ||
@@ -82,7 +82,7 @@ void BootloaderInstallFile::installStage2(void) | |||
82 | 82 | ||
83 | // place (new) bootloader | 83 | // place (new) bootloader |
84 | m_tempfile.open(); | 84 | m_tempfile.open(); |
85 | qDebug() << "renaming" << m_tempfile.fileName() << "->" << fwfile; | 85 | qDebug() << "[BootloaderInstallFile] renaming" << m_tempfile.fileName() << "to" << fwfile; |
86 | m_tempfile.close(); | 86 | m_tempfile.close(); |
87 | m_tempfile.rename(fwfile); | 87 | m_tempfile.rename(fwfile); |
88 | 88 | ||
@@ -95,7 +95,7 @@ void BootloaderInstallFile::installStage2(void) | |||
95 | 95 | ||
96 | bool BootloaderInstallFile::uninstall(void) | 96 | bool BootloaderInstallFile::uninstall(void) |
97 | { | 97 | { |
98 | qDebug() << __func__; | 98 | qDebug() << "[BootloaderInstallFile] Uninstalling bootloader"; |
99 | emit logItem(tr("Removing Rockbox bootloader"), LOGINFO); | 99 | emit logItem(tr("Removing Rockbox bootloader"), LOGINFO); |
100 | // check if a .ORIG file is present, and allow moving it back. | 100 | // check if a .ORIG file is present, and allow moving it back. |
101 | QString origbl = resolvePathCase(m_blfile + ".ORIG"); | 101 | QString origbl = resolvePathCase(m_blfile + ".ORIG"); |
@@ -127,7 +127,7 @@ bool BootloaderInstallFile::uninstall(void) | |||
127 | //! @return BootloaderRockbox, BootloaderOther or BootloaderUnknown. | 127 | //! @return BootloaderRockbox, BootloaderOther or BootloaderUnknown. |
128 | BootloaderInstallBase::BootloaderType BootloaderInstallFile::installed(void) | 128 | BootloaderInstallBase::BootloaderType BootloaderInstallFile::installed(void) |
129 | { | 129 | { |
130 | qDebug("%s()", __func__); | 130 | qDebug() << "[BootloaderInstallFile] checking installed bootloader"; |
131 | if(!resolvePathCase(m_blfile).isEmpty() | 131 | if(!resolvePathCase(m_blfile).isEmpty() |
132 | && !resolvePathCase(m_blfile + ".ORIG").isEmpty()) | 132 | && !resolvePathCase(m_blfile + ".ORIG").isEmpty()) |
133 | return BootloaderRockbox; | 133 | return BootloaderRockbox; |
@@ -140,7 +140,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallFile::installed(void) | |||
140 | 140 | ||
141 | BootloaderInstallBase::Capabilities BootloaderInstallFile::capabilities(void) | 141 | BootloaderInstallBase::Capabilities BootloaderInstallFile::capabilities(void) |
142 | { | 142 | { |
143 | qDebug() << __func__; | 143 | qDebug() << "[BootloaderInstallFile] getting capabilities"; |
144 | return Install | IsFile | CanCheckInstalled | Backup; | 144 | return Install | IsFile | CanCheckInstalled | Backup; |
145 | } | 145 | } |
146 | 146 | ||