extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-01-22 06:09:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup 22ca80eb7e: scraping regex was broken and potentially mixed with stdout

Browse Source
This commit is contained in:
Christian Schwarz 2018-09-04 13:30:52 -07:00
parent 0c4a3f8dc4
commit 4336af295f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zfs/zfs.go
View File

@ -477,7 +477,7 @@ func ZFSGet(fs *DatasetPath, props []string) (*ZFSProperties, error) {
return zfsGet(fs.ToString(), props) return zfsGet(fs.ToString(), props)
} }
var zfsGetDatasetDoesNotExistRegexp = regexp.MustCompile(`^cannot open '(\s+)': dataset does not exist`) var zfsGetDatasetDoesNotExistRegexp = regexp.MustCompile(`^cannot open '(\S+)': dataset does not exist`)
type DatasetDoesNotExist struct { type DatasetDoesNotExist struct {
Path string Path string
@ -488,12 +488,12 @@ func (d *DatasetDoesNotExist) Error() string { return fmt.Sprintf("dataset %q do
func zfsGet(path string, props []string) (*ZFSProperties, error) { func zfsGet(path string, props []string) (*ZFSProperties, error) {
args := []string{"get", "-Hp", "-o", "property,value", strings.Join(props, ","), path} args := []string{"get", "-Hp", "-o", "property,value", strings.Join(props, ","), path}
cmd := exec.Command(ZFS_BINARY, args...) cmd := exec.Command(ZFS_BINARY, args...)
output, err := cmd.CombinedOutput() stdout, err := cmd.Output()
if err != nil { if err != nil {
if exitErr, ok := err.(*exec.ExitError); ok { if exitErr, ok := err.(*exec.ExitError); ok {
if exitErr.Exited() { if exitErr.Exited() {
// screen-scrape output // screen-scrape output
if sm := zfsGetDatasetDoesNotExistRegexp.FindSubmatch(output); sm != nil { if sm := zfsGetDatasetDoesNotExistRegexp.FindSubmatch(exitErr.Stderr); sm != nil {
if string(sm[1]) == path { if string(sm[1]) == path {
return nil, &DatasetDoesNotExist{path} return nil, &DatasetDoesNotExist{path}
} }
@ -502,7 +502,7 @@ func zfsGet(path string, props []string) (*ZFSProperties, error) {
} }
return nil, err return nil, err
} }
o := string(output) o := string(stdout)
lines := strings.Split(o, "\n") lines := strings.Split(o, "\n")
if len(lines) < 1 || // account for newlines if len(lines) < 1 || // account for newlines
len(lines)-1 != len(props) { len(lines)-1 != len(props) {