ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge branch 'master' into interface-checks

Browse Source
This commit is contained in:
Gabe Rosenhouse
2016-12-15 18:20:34 -08:00
committed by GitHub
parent 5852c60bc4 ef00f717a6
commit 1c1cf2faf7
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ipam/host-local/backend/disk/backend.go
View File

@ -20,6 +20,7 @@ import (
"net"
"os"
"path/filepath"
"strings"
"github.com/containernetworking/cni/plugins/ipam/host-local/backend"
)
@ -61,7 +62,7 @@ func (s *Store) Reserve(id string, ip net.IP) (bool, error) {
if err != nil {
return false, err
}
if _, err := f.WriteString(id); err != nil {
if _, err := f.WriteString(strings.TrimSpace(id)); err != nil {
f.Close()
os.Remove(f.Name())
return false, err
@ -104,7 +105,7 @@ func (s *Store) ReleaseByID(id string) error {
if err != nil {
return nil
}
if string(data) == id {
if strings.TrimSpace(string(data)) == strings.TrimSpace(id) {
if err := os.Remove(path); err != nil {
return nil
}