[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. fd5e298efdeeae1e80af271326cd0c17a98feb4f

Sune Vuorela pusling-guest at alioth.debian.org
Wed Feb 18 21:14:34 UTC 2009


The following commit has been merged in the master branch:
commit 8451b9a38fa9194458bab60c992c8d8257ca4dea
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Wed Feb 18 22:12:53 2009 +0100

    warnings in a bit more cases and no warinngs when not wanting to backup a nonexistant dir

diff --git a/migrationtool.cpp b/migrationtool.cpp
index 2bfb623..36edd53 100644
--- a/migrationtool.cpp
+++ b/migrationtool.cpp
@@ -51,7 +51,7 @@ int MigrationTool::nextId() const
 	return Choice;
 	break;
       case Choice:
-	if(!d->choice->backupSelected() && d->choice->selected()==Clean)
+	if(!d->choice->backupSelected() && (d->choice->selected()==Clean||d->choice->selected()==Merge) && QFile::exists(QDir::homePath()+KDEDIR))
 	{
 	    return Warning;
 	}

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list