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

Make upgrading wallpapers work

Browse Source 
We were previously accessing an invalid metadata, because wallpapers
aren't necessarily found as plugins: Take care of this case.
This commit is contained in:
Sebastian Kügler 2013-03-28 03:50:06 +01:00
parent 98b4ceb3a2
commit 40ac6a5f0c
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/plasmapkg/plasmapkg.cpp
View File

@ -289,6 +289,10 @@ void PlasmaPkg::runMain()
continue; continue;
} }
} }
if (pkgPath.isEmpty()) {
pkgPath = d->package;
}
if (d->args->isSet("upgrade")) { if (d->args->isSet("upgrade")) {
d->installer->setPath(d->package); d->installer->setPath(d->package);
} }
@ -298,18 +302,21 @@ void PlasmaPkg::runMain()
} }
_p.append(d->package); _p.append(d->package);
d->installer->setPath(pkgPath); d->installer->setPath(pkgPath);
d->metadata = d->installer->metadata();
QString pluginName; QString pluginName;
if (!d->metadata.isValid() && d->metadata.pluginName().isEmpty()) { if (d->installer->isValid()) {
// plugin name given in command line d->metadata = d->installer->metadata();
pluginName = d->package; if (!d->metadata.isValid()) {
} else { pluginName = d->package;
// Parameter was a plasma package, get plugin name from the package } else if (!d->metadata.isValid() && d->metadata.pluginName().isEmpty()) {
pluginName = d->metadata.pluginName(); // plugin name given in command line
pluginName = d->package;
} else {
// Parameter was a plasma package, get plugin name from the package
pluginName = d->metadata.pluginName();
}
} }
QStringList installed = d->packages(d->pluginTypes); QStringList installed = d->packages(d->pluginTypes);
qDebug() << "installed wallpapers:" << installed << d->pluginTypes;
if (installed.contains(pluginName)) { if (installed.contains(pluginName)) {
d->installer->setPath(pluginName); d->installer->setPath(pluginName);
KJob *uninstallJob = d->installer->uninstall(pluginName, d->packageRoot); KJob *uninstallJob = d->installer->uninstall(pluginName, d->packageRoot);
@ -390,7 +397,10 @@ void PlasmaPkg::showPackageInfo(const QString& pluginName)
pkg.setPath(pluginName); pkg.setPath(pluginName);
KPluginInfo i = pkg.metadata(); KPluginInfo i = pkg.metadata();
if (!i.isValid()) {
d->coutput(i18n("Can't find plugin metadata: %1", pluginName));
exit(1);
}
d->coutput(i18n("Showing info for package: %1", pluginName)); d->coutput(i18n("Showing info for package: %1", pluginName));
d->coutput(i18n(" Name : %1", i.name())); d->coutput(i18n(" Name : %1", i.name()));
d->coutput(i18n(" Comment : %1", i.comment())); d->coutput(i18n(" Comment : %1", i.comment()));