alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* If an archived package is being installed use KIO::file_copy() to move it to the destination. If

Browse Source 
it is a directory, use KIO::copy() to copy the directory heirarchy over instead.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=824785
This commit is contained in:
Richard Dale 2008-06-26 16:30:40 +00:00
parent 2299f72880
commit 41d8ae9752
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package.cpp
View File

@ -27,6 +27,7 @@
#include <KArchiveEntry>
#include <KComponentData>
#include <KDesktopFile>
#include <KIO/CopyJob>
#include <KIO/FileCopyJob>
#include <KIO/Job>
#include <KPluginInfo>
@ -281,15 +282,19 @@ bool Package::installPackage(const QString& package,
if (archivedPackage) {
// it's in a temp dir, so just move it over.
job = KIO::file_move(path, targetName, -1, KIO::HideProgressInfo);
if (!job->exec()) {
kWarning() << "Could not copy package to destination:" << targetName << " : " << job->errorString();
return false;
}
} else {
// it's a directory containing the stuff, so copy the contents rather
// than move them
job = KIO::file_copy(path, targetName, -1, KIO::HideProgressInfo);
}
if (!job->exec()) {
kWarning() << "Could not move package to destination:" << targetName;
return false;
KIO::CopyJob* job(0);
job = KIO::copy(KUrl(path), KUrl(targetName), KIO::HideProgressInfo);
if (!job->exec()) {
kWarning() << "Could not move package to destination:" << targetName << " : " << job->errorString();
return false;
}
}
if (archivedPackage) {