Libguestfs - Mar 2017 - [PATCH] btrfs_filesystem_show: work with another old btrfs version

An old version of btrfs-progs (3.17 in this case) has a different
version string, so adapt our filtering to include this line as well.

Related to/updates commit 839ae5bcd537b3dc4f13bbea6fe40091ebc2b7f0.
---
 daemon/btrfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index d18f518..23513a9 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -2268,7 +2268,8 @@ do_btrfs_filesystem_show (const char *device)
     } else if (STRPREFIX (lines[i], "\t*** Some devices missing")) {
       reply_with_error_errno (ENODEV, "%s: missing devices", device);
       return NULL;
-    } else if (STRPREFIX (lines[i], "btrfs-progs v")) {
+    } else if (STRPREFIX (lines[i], "btrfs-progs v") ||
+               STRPREFIX (lines[i], "Btrfs v")) {
       /* Older versions of btrfs-progs output also the version string
        * (the same as `btrfs --version`.  This has been fixed upstream
        * since v4.3.1, commit e29ec82e4e66042ca55bf8cd9ef609e3b21a7eb7.
-- 
2.9.3

On Fri, Mar 17, 2017 at 04:21:33PM +0100, Pino Toscano
wrote:
> An old version of btrfs-progs (3.17 in this case) has a different
> version string, so adapt our filtering to include this line as well.
> 
> Related to/updates commit 839ae5bcd537b3dc4f13bbea6fe40091ebc2b7f0.
> ---
>  daemon/btrfs.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/daemon/btrfs.c b/daemon/btrfs.c
> index d18f518..23513a9 100644
> --- a/daemon/btrfs.c
> +++ b/daemon/btrfs.c
> @@ -2268,7 +2268,8 @@ do_btrfs_filesystem_show (const char *device)
>      } else if (STRPREFIX (lines[i], "\t*** Some devices
missing")) {
>        reply_with_error_errno (ENODEV, "%s: missing devices",
device);
>        return NULL;
> -    } else if (STRPREFIX (lines[i], "btrfs-progs v")) {
> +    } else if (STRPREFIX (lines[i], "btrfs-progs v") ||
> +               STRPREFIX (lines[i], "Btrfs v")) {
>        /* Older versions of btrfs-progs output also the version string
>         * (the same as `btrfs --version`.  This has been fixed upstream
>         * since v4.3.1, commit e29ec82e4e66042ca55bf8cd9ef609e3b21a7eb7.
> -- 
> 2.9.3
ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/