Skip to content

Commit

Permalink
[nemo-storage] Accept a partition even if it's not mountable or encry…
Browse files Browse the repository at this point in the history
…pted. Fixes JB#36851

Also following cases should work now (accept as formatable):
- Without partition table & file system
- With partition table but without partition
- With partition table and partition but without file system
- Zero'ed block device

See also commit sha1 bc3d518.
  • Loading branch information
rainemak committed Feb 12, 2019
1 parent cf036f2 commit c3ebca3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/udisks2blockdevices.cpp
Expand Up @@ -284,7 +284,7 @@ void BlockDevices::complete(Block *block, bool forceAccept)
});
}

bool willAccept = !unlocked && (block->isMountable() || block->isEncrypted() || block->isFormatting() || forceAccept);
bool willAccept = !unlocked && (block->isPartition() || block->isMountable() || block->isEncrypted() || block->isFormatting() || forceAccept);
qCInfo(lcMemoryCardLog) << "Completed block" << qPrintable(block->path())
<< "is" << (willAccept ? "accepted" : "rejected");
block->dumpInfo();
Expand Down

0 comments on commit c3ebca3

Please sign in to comment.