Skip to content
Snippets Groups Projects
Commit 849137c2 authored by Teo Mrnjavac's avatar Teo Mrnjavac
Browse files

Use UUIDs instead of paths to match osprober entries with partitions.

parent 81126125
No related branches found
No related tags found
No related merge requests found
...@@ -205,27 +205,37 @@ PartitionModel::data( const QModelIndex& index, int role ) const ...@@ -205,27 +205,37 @@ PartitionModel::data( const QModelIndex& index, int role ) const
// Osprober roles: // Osprober roles:
case OsproberNameRole: case OsproberNameRole:
foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) foreach ( const OsproberEntry& osproberEntry, m_osproberEntries )
if ( osproberEntry.path == partition->partitionPath() ) if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone &&
!partition->fileSystem().uuid().isEmpty() &&
osproberEntry.uuid == partition->fileSystem().uuid() )
return osproberEntry.prettyName; return osproberEntry.prettyName;
return QVariant(); return QVariant();
case OsproberPathRole: case OsproberPathRole:
foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) foreach ( const OsproberEntry& osproberEntry, m_osproberEntries )
if ( osproberEntry.path == partition->partitionPath() ) if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone &&
!partition->fileSystem().uuid().isEmpty() &&
osproberEntry.uuid == partition->fileSystem().uuid() )
return osproberEntry.path; return osproberEntry.path;
return QVariant(); return QVariant();
case OsproberCanBeResizedRole: case OsproberCanBeResizedRole:
foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) foreach ( const OsproberEntry& osproberEntry, m_osproberEntries )
if ( osproberEntry.path == partition->partitionPath() ) if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone &&
!partition->fileSystem().uuid().isEmpty() &&
osproberEntry.uuid == partition->fileSystem().uuid() )
return osproberEntry.canBeResized; return osproberEntry.canBeResized;
return QVariant(); return QVariant();
case OsproberRawLineRole: case OsproberRawLineRole:
foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) foreach ( const OsproberEntry& osproberEntry, m_osproberEntries )
if ( osproberEntry.path == partition->partitionPath() ) if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone &&
!partition->fileSystem().uuid().isEmpty() &&
osproberEntry.uuid == partition->fileSystem().uuid() )
return osproberEntry.line; return osproberEntry.line;
return QVariant(); return QVariant();
case OsproberHomePartitionPathRole: case OsproberHomePartitionPathRole:
foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) foreach ( const OsproberEntry& osproberEntry, m_osproberEntries )
if ( osproberEntry.path == partition->partitionPath() ) if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone &&
!partition->fileSystem().uuid().isEmpty() &&
osproberEntry.uuid == partition->fileSystem().uuid() )
return osproberEntry.homePath; return osproberEntry.homePath;
return QVariant(); return QVariant();
// end Osprober roles. // end Osprober roles.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment