File 0001-osutil-disks-blockdev-need-not-be-availabl... of Package snapd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-osutil-disks-blockdev-need-not-be-available-in-the-P.patch of Package snapd (Revision 172f550205b50fa64c97e3cddb7fb859)

Currently displaying revision 172f550205b50fa64c97e3cddb7fb859 , Show latest

From b5c7ebdf004689a0252bee946c512c63b1dab659 Mon Sep 17 00:00:00 2001
Message-Id: <b5c7ebdf004689a0252bee946c512c63b1dab659.1647952092.git.maciej.zenon.borzecki@canonical.com>
From: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Date: Tue, 22 Mar 2022 13:26:12 +0100
Subject: [PATCH] osutil/disks: blockdev need not be available in the PATH

Blockdev command may be located under /usr/sbin and on some systems eg. openSUSE
sbin locations are not in the default PATH.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
---
 osutil/disks/gpt_test.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osutil/disks/gpt_test.go b/osutil/disks/gpt_test.go
index 92f2a40dc21287b6b531f942d85105e7d8e0bfb7..fb93025cb7e6564fee507c484300873d1dd2b2db 100644
--- a/osutil/disks/gpt_test.go
+++ b/osutil/disks/gpt_test.go
@@ -21,6 +21,7 @@ package disks_test
 
 import (
 	"encoding/binary"
+	"errors"
 	"io"
 	"os"
 	"os/exec"
@@ -235,6 +236,9 @@ func (s *gptSuite) TestReadFileFail(c *C) {
 }
 
 func (s *gptSuite) TestCalculateSize(c *C) {
+	if _, err := exec.LookPath("blockdev"); err != nil && errors.Is(err, exec.ErrNotFound) {
+		c.Skip("blockdev command not available")
+	}
 	calculated, err := disks.CalculateLastUsableLBA(s.image)
 	c.Assert(err, IsNil)
 	gptHeader, err := disks.ReadGPTHeader(s.image)
@@ -244,6 +248,9 @@ func (s *gptSuite) TestCalculateSize(c *C) {
 }
 
 func (s *gptSuite) TestCalculateSizeResized(c *C) {
+	if _, err := exec.LookPath("blockdev"); err != nil && errors.Is(err, exec.ErrNotFound) {
+		c.Skip("blockdev command not available")
+	}
 	err := exec.Command("truncate", "--size", "256M", s.image).Run()
 	c.Assert(err, IsNil)
 
-- 
2.35.1

Places

File 0001-osutil-disks-blockdev-need-not-be-available-in-the-P.patch of Package snapd (Revision 172f550205b50fa64c97e3cddb7fb859)

Places