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.
This commit is contained in:
Eugene Yakubovich
2015-06-12 12:15:11 -07:00
parent 02981925c9
commit 16680be42d
28 changed files with 30 additions and 30 deletions

View File

@ -6,7 +6,7 @@ import (
"net"
"time"
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
"github.com/d2g/dhcp4"
)
const (

View File

@ -6,7 +6,7 @@ import (
"net"
"time"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
"golang.org/x/sys/unix"
)
const (

View File

@ -6,7 +6,7 @@ import (
"strings"
"syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
// AddrAdd will add an IP address to a link device.

View File

@ -7,7 +7,7 @@ import (
"net"
"syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
var native = nl.NativeEndian()

View File

@ -5,7 +5,7 @@ import (
"syscall"
"unsafe"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
const (

View File

@ -11,7 +11,7 @@ package netlink
import (
"net"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
const (

View File

@ -4,7 +4,7 @@ import (
"fmt"
"syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
func LinkGetProtinfo(link Link) (Protinfo, error) {

View File

@ -5,7 +5,7 @@ import (
"net"
"syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
// RtAttr is shared so it is in netlink_linux.go

View File

@ -3,7 +3,7 @@ package netlink
import (
"syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {

View File

@ -4,7 +4,7 @@ import (
"fmt"
"syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netlink/nl"
)
func writeStateAlgo(a *XfrmStateAlgo) []byte {

View File

@ -13,7 +13,7 @@ import (
"syscall"
"testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
"golang.org/x/sys/unix"
)
// TestSCMCredentials tests the sending and receiving of credentials

View File

@ -9,7 +9,7 @@ package unix_test
import (
"testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
"golang.org/x/sys/unix"
)
func TestMmap(t *testing.T) {

View File

@ -9,7 +9,7 @@ package unix_test
import (
"testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
"golang.org/x/sys/unix"
)
const MNT_WAIT = 1

View File

@ -9,7 +9,7 @@ package unix_test
import (
"testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
"golang.org/x/sys/unix"
)
func testSetGetenv(t *testing.T, key, value string) {

View File

@ -18,7 +18,7 @@ import (
"testing"
"time"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
"golang.org/x/sys/unix"
)
// Tests that below functions, structures and constants are consistent