Compare commits

...

2 Commits

Author SHA1 Message Date
Antonio Rojas 8238c94447 Don't hardcode dbus policy install dir
Install the policy files to the cmake provided locations instead of hardcoding the path to /etc/dbus-1

Differential Revision: https://phabricator.kde.org/D21162
2019-05-12 22:32:58 +02:00
Andrius Štikonas 4b6a26f0f8 Fix setting partition path when restoring partitions.
BUG: 399791
2019-05-10 02:12:07 +01:00
2 changed files with 3 additions and 3 deletions

View File

@ -125,7 +125,7 @@ bool RestoreOperation::execute(Report& parent)
Report* report = parent.newChild(description());
if (overwrittenPartition())
restorePartition().setPartitionPath(overwrittenPartition()->devicePath());
restorePartition().setPartitionPath(overwrittenPartition()->partitionPath());
if (overwrittenPartition() || (rval = createPartitionJob()->run(*report))) {
restorePartition().setState(Partition::State::None);

View File

@ -50,8 +50,8 @@ target_link_libraries(kpmcore_externalcommand
)
install(TARGETS kpmcore_externalcommand DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
install( FILES util/org.kde.kpmcore.helperinterface.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
install( FILES util/org.kde.kpmcore.applicationinterface.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
install( FILES util/org.kde.kpmcore.helperinterface.conf DESTINATION ${KDE_INSTALL_DBUSDIR}/system.d )
install( FILES util/org.kde.kpmcore.applicationinterface.conf DESTINATION ${KDE_INSTALL_DBUSDIR}/system.d )
kauth_install_helper_files(kpmcore_externalcommand org.kde.kpmcore.externalcommand root)
kauth_install_actions(org.kde.kpmcore.externalcommand util/org.kde.kpmcore.externalcommand.actions)