[gparted] Finish removal of btrfs-show (!26)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Finish removal of btrfs-show (!26)
- Date: Fri, 15 Mar 2019 17:38:23 +0000 (UTC)
commit 3607ede307074b04337742df95a87edeaa36eb19
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Mon Mar 11 21:24:22 2019 +0000
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
src/btrfs.cc | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
---
diff --git a/src/btrfs.cc b/src/btrfs.cc
index f9dbe9a0..fb4a1be0 100644
--- a/src/btrfs.cc
+++ b/src/btrfs.cc
@@ -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.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]