No more path rewriting

Path rewriting causes too many problems when vendoring
vendored code. When CNI code is vendored into rkt,
godep has problems code already vendored by CNI.

diff --git a/ip/ipmasq.go b/ip/ipmasq.go
index 665189b..7f8740d 100644 (file)
--- a/ip/ipmasq.go
+++ b/ip/ipmasq.go
@@ -18,7 +18,7 @@ import (
        "fmt"
        "net"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
+       "github.com/coreos/go-iptables/iptables"
 )
 
 // SetupIPMasq installs iptables rules to masquerade traffic

diff --git a/ip/link.go b/ip/link.go
index c99f4f3..3936ed9 100644 (file)
--- a/ip/link.go
+++ b/ip/link.go
@@ -20,7 +20,7 @@ import (
        "net"
        "os"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
+       "github.com/vishvananda/netlink"
 )
 
 func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {

diff --git a/ip/route.go b/ip/route.go
index f310f1e..04e660e 100644 (file)
--- a/ip/route.go
+++ b/ip/route.go
@@ -17,7 +17,7 @@ package ip
 import (
        "net"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
+       "github.com/vishvananda/netlink"
 )
 
 // AddDefaultRoute sets the default route on the given gateway.

diff --git a/plugin/ipam.go b/plugin/ipam.go
index f5a5033..6718ed2 100644 (file)
--- a/plugin/ipam.go
+++ b/plugin/ipam.go
@@ -23,8 +23,8 @@ import (
        "path/filepath"
        "strings"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
        "github.com/appc/cni/pkg/ip"
+       "github.com/vishvananda/netlink"
 )
 
 // Find returns the full path of the plugin by searching in CNI_PATH