andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

compare partition's device path with device's, not partition table pointers 

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1129867
This commit is contained in:
Volker Lanz 2010-05-24 01:05:01 +00:00
parent f123525c22
commit 5327ca792a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ops/setfilesystemlabeloperation.cpp
View File

@ -47,7 +47,7 @@ SetFileSystemLabelOperation::SetFileSystemLabelOperation(Partition& p, const QSt
bool SetFileSystemLabelOperation::targets(const Device& d) const bool SetFileSystemLabelOperation::targets(const Device& d) const
{ {
return labeledPartition().parent() == d.partitionTable(); return labeledPartition().devicePath() == d.deviceNode();
} }
bool SetFileSystemLabelOperation::targets(const Partition& p) const bool SetFileSystemLabelOperation::targets(const Partition& p) const
@ -69,6 +69,6 @@ QString SetFileSystemLabelOperation::description() const
{ {
if (oldLabel().isEmpty()) if (oldLabel().isEmpty())
return QString(i18nc("@info/plain", "Set label for partition <filename>%1</filename> to \"%2\"", labeledPartition().deviceNode(), newLabel())); return QString(i18nc("@info/plain", "Set label for partition <filename>%1</filename> to \"%2\"", labeledPartition().deviceNode(), newLabel()));
return QString(i18nc("@info/plain", "Set label for partition <filename>%1</filename> from \"%2\" to \"%3\"", labeledPartition().deviceNode(), oldLabel(), newLabel())); return QString(i18nc("@info/plain", "Set label for partition <filename>%1</filename> from \"%2\" to \"%3\"", labeledPartition().deviceNode(), oldLabel(), newLabel()));
} }