Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish removal of btrfs-show (!26) 

Remove use of btrfs-show from everywhere else in the btrfs module.

Closes !26 - Remove support for btrfs-progs < 3.12
This commit is contained in:
Mike Fleetwood 2019-03-11 21:24:22 +00:00 committed by Curtis Gedak
parent 9c40b7fff0
commit 3607ede307
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/btrfs.cc
View File

@ -86,15 +86,7 @@ FS btrfs::get_filesystem_support()
}
else
{
//Fall back to using btrfs-show and btrfsctl, which
// were depreciated October 2011
if ( ! Glib::find_program_in_path( "btrfs-show" ) .empty() )
{
fs.read = FS::EXTERNAL;
fs .read_label = FS::EXTERNAL ;
fs .read_uuid = FS::EXTERNAL ;
}
// Fall back to using btrfsctl which was depreciated October 2011.
//Resizing of btrfs requires btrfsctl, mount, umount
// and kernel support
@ -216,12 +208,8 @@ void btrfs::set_used_sectors( Partition & partition )
// devices.
// 4) Extents can be and are relocated to other devices within the file system
// when shrinking a device.
if ( btrfs_found )
Utils::execute_command( "btrfs filesystem show " + Glib::shell_quote( partition.get_path() ),
output, error, true );
else
Utils::execute_command( "btrfs-show " + Glib::shell_quote( partition.get_path() ),
output, error, true );
Utils::execute_command("btrfs filesystem show " + Glib::shell_quote(partition.get_path()),
output, error, true);
//In many cases the exit status doesn't reflect valid output or an error condition
// so rely on parsing the output to determine success.
@ -391,12 +379,8 @@ void btrfs::read_label( Partition & partition )
void btrfs::read_uuid( Partition & partition )
{
if ( btrfs_found )
Utils::execute_command( "btrfs filesystem show " + Glib::shell_quote( partition.get_path() ),
output, error, true );
else
Utils::execute_command( "btrfs-show " + Glib::shell_quote( partition.get_path() ),
output, error, true );
Utils::execute_command("btrfs filesystem show " + Glib::shell_quote(partition.get_path()),
output, error, true);
//In many cases the exit status doesn't reflect valid output or an error condition
// so rely on parsing the output to determine success.
@ -468,10 +452,7 @@ const BTRFS_Device & btrfs::get_cache_entry( const Glib::ustring & path )
Glib::ustring output, error ;
std::vector<int> devid_list ;
std::vector<Glib::ustring> path_list ;
if ( btrfs_found )
Utils::execute_command( "btrfs filesystem show " + Glib::shell_quote( path ), output, error, true );
else
Utils::execute_command( "btrfs-show " + Glib::shell_quote( path ), output, error, true );
Utils::execute_command("btrfs filesystem show " + Glib::shell_quote(path), output, error, true);
//In many cases the exit status doesn't reflect valid output or an error condition
// so rely on parsing the output to determine success.