[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. ae9567af86717d6c273544c50434e68c6fb88792
Modestas Vainius
modax-guest at alioth.debian.org
Sun Mar 1 15:41:33 UTC 2009
The following commit has been merged in the master branch:
commit ae9567af86717d6c273544c50434e68c6fb88792
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sun Mar 1 17:40:17 2009 +0200
Do not use canonical path on non-existing dirs.
Signed-off-by: Modestas Vainius <modestas at vainius.eu>
diff --git a/migrationpage.cpp b/migrationpage.cpp
index a55ced7..50dad57 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -48,7 +48,7 @@ void MigrationPagePrivate::doMagic()
try
{
DirOperations::recursiveCpDir(KaboomSettings::instance().kdehomeDir().canonicalPath(),
- KaboomSettings::instance().kde3backupDir().canonicalPath(),
+ KaboomSettings::instance().kde3backupDir().path(),
DirOperations::RemoveDestination, progress);
}
catch (DirOperations::Exception &e)
@@ -81,7 +81,7 @@ void MigrationPagePrivate::doMagic()
break;
case MigrationTool::Move:
DirOperations::recursiveCpDir(KaboomSettings::instance().kde4homeDir().canonicalPath(),
- KaboomSettings::instance().kdehomeDir().canonicalPath(),
+ KaboomSettings::instance().kdehomeDir().path(),
DirOperations::RemoveDestination, progress);
qDebug() << "move .kde4 over .kde";
break;
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list