[go-bindata] update to latest master commit
by Lokesh Mandvekar
commit 7c2401a391a078f82c568786d747ff43dfd18673
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Dec 2 11:36:23 2014 -0800
update to latest master commit
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
.gitignore | 1 +
go-bindata.spec | 23 ++++++++++++-----------
sources | 2 +-
3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 869a4fa..23c7bff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/go-bindata-79847ab.tar.gz
+/go-bindata-f94581b.tar.gz
diff --git a/go-bindata.spec b/go-bindata.spec
index 5aeeb42..922c11c 100644
--- a/go-bindata.spec
+++ b/go-bindata.spec
@@ -1,18 +1,17 @@
%global debug_package %{nil}
%global import_path github.com/jteeuwen/go-bindata
-%global gopath %{_datadir}/gocode
-%global commit 79847ab3e91ae5d2e1b18796c1795c78f29565d7
+%global commit f94581bd91620d0ccd9c22bb1d2de13f6a605857
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: go-bindata
-Version: 0
-Release: 0.6.git%{shortcommit}%{?dist}
+Version: 3.0.7
+Release: 1.git%{shortcommit}%{?dist}
Summary: A small utility which generates Go code from any file
License: MIT
URL: http://%{import_path}
Source0: https://%{import_path}/archive/%{commit}/go-bindata-%{shortcommit}.tar.gz
ExclusiveArch: %{ix86} x86_64 %{arm}
-BuildRequires: golang
+BuildRequires: golang >= 1.3.3
%description
%{summary}
@@ -25,17 +24,19 @@ compressed before being converted to a raw byte slice.
%setup -n go-bindata-%{commit}
%build
-mkdir -p src/github.com/jteeuwen/
-ln -s $(pwd) src/github.com/jteeuwen/go-bindata
-export GOPATH=$(pwd)
-go build -v -a
+mkdir -p ./_build/src/github.com/jteeuwen/
+ln -s $(pwd) ./_build/src/github.com/jteeuwen/go-bindata
+export GOPATH=$(pwd)/_build:%{gopath}
+pushd ./go-bindata/
+go build .
+popd
%install
install -d -p %{buildroot}%{_bindir}
-install -m 755 go-bindata-%{commit} %{buildroot}%{_bindir}/go-bindata
+install -m 755 go-bindata/go-bindata %{buildroot}%{_bindir}/go-bindata
%files
-%doc CONTRIBUTORS LICENSE README.md
+%doc LICENSE README.md
%{_bindir}/go-bindata
%changelog
diff --git a/sources b/sources
index 35ee3cc..2eea1d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98251d718dca2d64a1f93247f4020f3a go-bindata-79847ab.tar.gz
+f36d2cded04964d8465d5c42e66e81e9 go-bindata-f94581b.tar.gz
9 years, 4 months
[flannel] rename 0001-remove-third-party-dependency-on-Godeps.patch -> flannel-remove-third-party-dependency-o
by John W. Linville
commit 222bc0012f951d20a325102d041e1d5d35c60e81
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Dec 2 14:12:17 2014 -0500
rename 0001-remove-third-party-dependency-on-Godeps.patch -> flannel-remove-third-party-dependency-on-Godeps.patch
...l-remove-third-party-dependency-on-Godeps.patch | 0
flannel.spec | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/0001-remove-third-party-dependency-on-Godeps.patch b/flannel-remove-third-party-dependency-on-Godeps.patch
similarity index 100%
rename from 0001-remove-third-party-dependency-on-Godeps.patch
rename to flannel-remove-third-party-dependency-on-Godeps.patch
diff --git a/flannel.spec b/flannel.spec
index 3eed850..394744a 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -18,7 +18,7 @@ Source1: flanneld.service
Source2: flanneld.sysconf
ExclusiveArch: %{ix86} x86_64 %{arm}
-Patch0: 0001-remove-third-party-dependency-on-Godeps.patch
+Patch0: flannel-remove-third-party-dependency-on-Godeps.patch
BuildRequires: golang >= 1.2.7
BuildRequires: golang-cover
9 years, 4 months
[flannel] Remove patches related to out-of-tree slice backend
by John W. Linville
commit 2652cfe9db7871203a1aabd2a298d5184df9d1c7
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Dec 2 14:11:12 2014 -0500
Remove patches related to out-of-tree slice backend
- Update to latest upstream
.gitignore | 2 +-
0001-remove-third-party-dependency-on-Godeps.patch | 97 +++++-------
flannel-slice-type.patch | 155 --------------------
flannel-vxlan-subnetfix.patch | 12 --
flannel.spec | 14 +-
sources | 2 +-
6 files changed, 49 insertions(+), 233 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28e2cf8..7d1a984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/flannel-071d778.tar.gz
+/flannel-a7b435a.tar.gz
diff --git a/0001-remove-third-party-dependency-on-Godeps.patch b/0001-remove-third-party-dependency-on-Godeps.patch
index e2c0eb4..d87c577 100644
--- a/0001-remove-third-party-dependency-on-Godeps.patch
+++ b/0001-remove-third-party-dependency-on-Godeps.patch
@@ -1,24 +1,6 @@
-From e9097f81f65a1596ab79989de0e0ae8d0d031012 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup(a)redhat.com>
-Date: Wed, 19 Nov 2014 14:18:08 +0100
-Subject: [PATCH] remove third party dependency on Godeps
-
----
- backend/udp/cproxy.go | 2 +-
- backend/udp/udp.go | 4 ++--
- backend/vxlan/device.go | 6 +++---
- backend/vxlan/vxlan.go | 4 ++--
- main.go | 4 ++--
- pkg/ip/iface.go | 2 +-
- subnet/registry.go | 4 ++--
- subnet/subnet.go | 4 ++--
- subnet/subnet_test.go | 2 +-
- 9 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/backend/udp/cproxy.go b/backend/udp/cproxy.go
-index 062d277..f1cce26 100644
---- a/backend/udp/cproxy.go
-+++ b/backend/udp/cproxy.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go 2014-12-02 13:44:51.378412184 -0500
@@ -9,7 +9,7 @@ import (
"reflect"
"unsafe"
@@ -28,10 +10,9 @@ index 062d277..f1cce26 100644
"github.com/coreos/flannel/pkg/ip"
)
-diff --git a/backend/udp/udp.go b/backend/udp/udp.go
-index 90f8617..782f7d3 100644
---- a/backend/udp/udp.go
-+++ b/backend/udp/udp.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go 2014-12-02 13:44:51.378412184 -0500
@@ -9,8 +9,8 @@ import (
"sync"
"syscall"
@@ -43,10 +24,9 @@ index 90f8617..782f7d3 100644
"github.com/coreos/flannel/backend"
"github.com/coreos/flannel/pkg/ip"
-diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
-index a15b067..9764189 100644
---- a/backend/vxlan/device.go
-+++ b/backend/vxlan/device.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go 2014-12-02 13:44:51.378412184 -0500
@@ -7,9 +7,9 @@ import (
"syscall"
"time"
@@ -60,10 +40,9 @@ index a15b067..9764189 100644
"github.com/coreos/flannel/pkg/ip"
)
-diff --git a/backend/vxlan/vxlan.go b/backend/vxlan/vxlan.go
-index b47eea2..4a878ce 100644
---- a/backend/vxlan/vxlan.go
-+++ b/backend/vxlan/vxlan.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go 2014-12-02 13:44:51.379412195 -0500
@@ -6,8 +6,8 @@ import (
"net"
"sync"
@@ -75,10 +54,9 @@ index b47eea2..4a878ce 100644
"github.com/coreos/flannel/backend"
"github.com/coreos/flannel/subnet"
-diff --git a/main.go b/main.go
-index 5f81923..0955fc7 100644
---- a/main.go
-+++ b/main.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go 2014-12-02 13:44:51.379412195 -0500
@@ -12,8 +12,8 @@ import (
"syscall"
"time"
@@ -90,10 +68,9 @@ index 5f81923..0955fc7 100644
"github.com/coreos/flannel/backend"
"github.com/coreos/flannel/pkg/ip"
-diff --git a/pkg/ip/iface.go b/pkg/ip/iface.go
-index 077feec..dee69a6 100644
---- a/pkg/ip/iface.go
-+++ b/pkg/ip/iface.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go 2014-12-02 13:44:51.380412206 -0500
@@ -5,7 +5,7 @@ import (
"net"
"syscall"
@@ -103,10 +80,21 @@ index 077feec..dee69a6 100644
)
func GetIfaceIP4Addr(iface *net.Interface) (net.IP, error) {
-diff --git a/subnet/registry.go b/subnet/registry.go
-index 8c6797e..ccfee74 100644
---- a/subnet/registry.go
-+++ b/subnet/registry.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig 2014-12-02 13:46:27.648471327 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go 2014-12-02 13:46:35.830561345 -0500
+@@ -3,7 +3,7 @@ package ip
+ import (
+ "bytes"
+ "fmt"
+- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
++ log "github.com/golang/glog"
+ "os/exec"
+ "regexp"
+ "strconv"
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go 2014-12-02 13:44:51.380412206 -0500
@@ -5,8 +5,8 @@ import (
"sync"
"time"
@@ -118,10 +106,9 @@ index 8c6797e..ccfee74 100644
)
type subnetRegistry interface {
-diff --git a/subnet/subnet.go b/subnet/subnet.go
-index 465952f..1208dfd 100644
---- a/subnet/subnet.go
-+++ b/subnet/subnet.go
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go 2014-12-02 13:44:51.381412217 -0500
@@ -9,8 +9,8 @@ import (
"strconv"
"time"
@@ -133,11 +120,10 @@ index 465952f..1208dfd 100644
"github.com/coreos/flannel/pkg/ip"
"github.com/coreos/flannel/pkg/task"
-diff --git a/subnet/subnet_test.go b/subnet/subnet_test.go
-index 803fdc7..2ee58d5 100644
---- a/subnet/subnet_test.go
-+++ b/subnet/subnet_test.go
-@@ -5,7 +5,7 @@ import (
+diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go
+--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig 2014-11-27 13:43:14.000000000 -0500
++++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go 2014-12-02 13:44:51.381412217 -0500
+@@ -6,7 +6,7 @@ import (
"testing"
"time"
@@ -146,6 +132,3 @@ index 803fdc7..2ee58d5 100644
"github.com/coreos/flannel/pkg/ip"
)
---
-1.9.3
-
diff --git a/flannel.spec b/flannel.spec
index a3cbcb4..3eed850 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -4,12 +4,12 @@
%global project coreos
%global repo flannel
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 071d7786cfae6a9ef6f8b83a60858d34aa8f8749
+%global commit a7b435a9205335db25372bde8c1ff4e522ed3bc7
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: flannel
Version: 0.1.0
-Release: 7.git%{shortcommit}%{?dist}
+Release: 8.git%{shortcommit}%{?dist}
Summary: Etcd address management agent for overlay networks
License: ASL 2.0
URL: https://%{import_path}
@@ -18,9 +18,7 @@ Source1: flanneld.service
Source2: flanneld.sysconf
ExclusiveArch: %{ix86} x86_64 %{arm}
-Patch0: flannel-slice-type.patch
-Patch1: flannel-vxlan-subnetfix.patch
-Patch2: 0001-remove-third-party-dependency-on-Godeps.patch
+Patch0: 0001-remove-third-party-dependency-on-Godeps.patch
BuildRequires: golang >= 1.2.7
BuildRequires: golang-cover
@@ -75,8 +73,6 @@ building other packages which use %{project}/%{repo}.
%prep
%setup -q -n %{repo}-%{commit}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
rm -rf Godeps
@@ -122,6 +118,10 @@ cp -pav {backend,pkg,subnet} %{buildroot}/%{gopath}/src/%{import_path}/
%{gopath}/src/%{import_path}/
%changelog
+* Tue Dec 2 2014 John W. Linville <linville(a)redhat.com> - 0.1.0-8.gita7b435a
+- Remove patches related to out-of-tree slice backend
+- Update to latest upstream
+
* Thu Nov 20 2014 jchaloup <jchaloup(a)redhat.com> - 0.1.0-7.git071d778
- Removing deps on Godeps and adding deps on golang-github packages
- Removing wait-online service and changing Type of flannel.service from simple to notify
diff --git a/sources b/sources
index 8c351cc..bf928c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5dedc1a99e8531ef6a7bd968f89f8f6 flannel-071d778.tar.gz
+c0607a068952ae51cb6d53a72ce62d21 flannel-a7b435a.tar.gz
9 years, 4 months
[docker-io] Resolves: rhbz#1169151, rhbz#1169334
by Lokesh Mandvekar
commit c2c0918eb5533cc849c6636ab4561fa80e97ba44
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Dec 2 09:33:43 2014 -0800
Resolves: rhbz#1169151, rhbz#1169334
NVR: docker-io-1.3.2-4.git353ff40
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 7 ++-
initialize-db.patch | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 47d136f..7cd775e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -16,7 +16,7 @@
Name: %{repo}-io
Version: 1.3.2
-Release: 3.git%{shortcommit}%{?dist}
+Release: 4.git%{shortcommit}%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -27,6 +27,7 @@ Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
+Patch0: initialize-db.patch
BuildRequires: glibc-static
BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
@@ -191,6 +192,7 @@ The import paths of import_path/pkg/...
%prep
%setup -qn %{repo}-%{commit}
+%patch0 -p1
rm -rf vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap}
find . -name "*.go" \
-print |\
@@ -313,6 +315,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Tue Dec 02 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-4.git353ff40
+- Resolves: rhbz#1169151, rhbz#1169334
+
* Sun Nov 30 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-3.git353ff40
- Resolves: rhbz#1169035, rhbz#1169151
- bring back golang deps (except libcontainer)
diff --git a/initialize-db.patch b/initialize-db.patch
new file mode 100644
index 0000000..69949a7
--- /dev/null
+++ b/initialize-db.patch
@@ -0,0 +1,152 @@
+From fb06e1c6ebcf5408e6a7d0bfcf9264571eab69a1 Mon Sep 17 00:00:00 2001
+From: Erik Hollensbe <github(a)hollensbe.org>
+Date: Tue, 2 Dec 2014 03:02:25 -0800
+Subject: [PATCH] graphdb: initialize the database semi-idempotently on every
+ connection.
+
+Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github(a)hollensbe.org> (github: erikh)
+---
+ pkg/graphdb/conn_sqlite3.go | 18 +-----------
+ pkg/graphdb/graphdb.go | 68 ++++++++++++++++++++++++++-------------------
+ pkg/graphdb/graphdb_test.go | 2 +-
+ 3 files changed, 41 insertions(+), 47 deletions(-)
+
+diff --git a/pkg/graphdb/conn_sqlite3.go b/pkg/graphdb/conn_sqlite3.go
+index b6a8027..455790a 100644
+--- a/pkg/graphdb/conn_sqlite3.go
++++ b/pkg/graphdb/conn_sqlite3.go
+@@ -4,31 +4,15 @@ package graphdb
+
+ import (
+ "database/sql"
+- "os"
+
+ _ "code.google.com/p/gosqlite/sqlite3" // registers sqlite
+ )
+
+ func NewSqliteConn(root string) (*Database, error) {
+- initDatabase := false
+-
+- stat, err := os.Stat(root)
+- if err != nil {
+- if os.IsNotExist(err) {
+- initDatabase = true
+- } else {
+- return nil, err
+- }
+- }
+-
+- if stat != nil && stat.Size() == 0 {
+- initDatabase = true
+- }
+-
+ conn, err := sql.Open("sqlite3", root)
+ if err != nil {
+ return nil, err
+ }
+
+- return NewDatabase(conn, initDatabase)
++ return NewDatabase(conn)
+ }
+diff --git a/pkg/graphdb/graphdb.go b/pkg/graphdb/graphdb.go
+index 450bd50..6234203 100644
+--- a/pkg/graphdb/graphdb.go
++++ b/pkg/graphdb/graphdb.go
+@@ -73,45 +73,55 @@ func IsNonUniqueNameError(err error) bool {
+ }
+
+ // Create a new graph database initialized with a root entity
+-func NewDatabase(conn *sql.DB, init bool) (*Database, error) {
++func NewDatabase(conn *sql.DB) (*Database, error) {
+ if conn == nil {
+ return nil, fmt.Errorf("Database connection cannot be nil")
+ }
+ db := &Database{conn: conn}
+
+- if init {
+- if _, err := conn.Exec(createEntityTable); err != nil {
+- return nil, err
+- }
+- if _, err := conn.Exec(createEdgeTable); err != nil {
+- return nil, err
+- }
+- if _, err := conn.Exec(createEdgeIndices); err != nil {
+- return nil, err
+- }
++ if _, err := conn.Exec(createEntityTable); err != nil {
++ return nil, err
++ }
++ if _, err := conn.Exec(createEdgeTable); err != nil {
++ return nil, err
++ }
++ if _, err := conn.Exec(createEdgeIndices); err != nil {
++ return nil, err
++ }
+
+- rollback := func() {
+- conn.Exec("ROLLBACK")
+- }
++ rollback := func() {
++ conn.Exec("ROLLBACK")
++ }
+
+- // Create root entities
+- if _, err := conn.Exec("BEGIN"); err != nil {
+- return nil, err
+- }
+- if _, err := conn.Exec("INSERT INTO entity (id) VALUES (?);", "0"); err != nil {
+- rollback()
+- return nil, err
+- }
++ // Create root entities
++ if _, err := conn.Exec("BEGIN"); err != nil {
++ return nil, err
++ }
+
+- if _, err := conn.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", "0", "/"); err != nil {
+- rollback()
+- return nil, err
+- }
++ if _, err := conn.Exec("DELETE FROM entity where id = ?", "0"); err != nil {
++ rollback()
++ return nil, err
++ }
+
+- if _, err := conn.Exec("COMMIT"); err != nil {
+- return nil, err
+- }
++ if _, err := conn.Exec("INSERT INTO entity (id) VALUES (?);", "0"); err != nil {
++ rollback()
++ return nil, err
++ }
++
++ if _, err := conn.Exec("DELETE FROM edge where entity_id=? and name=?", "0", "/"); err != nil {
++ rollback()
++ return nil, err
+ }
++
++ if _, err := conn.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", "0", "/"); err != nil {
++ rollback()
++ return nil, err
++ }
++
++ if _, err := conn.Exec("COMMIT"); err != nil {
++ return nil, err
++ }
++
+ return db, nil
+ }
+
+diff --git a/pkg/graphdb/graphdb_test.go b/pkg/graphdb/graphdb_test.go
+index 7568e66..f228285 100644
+--- a/pkg/graphdb/graphdb_test.go
++++ b/pkg/graphdb/graphdb_test.go
+@@ -14,7 +14,7 @@ import (
+ func newTestDb(t *testing.T) (*Database, string) {
+ p := path.Join(os.TempDir(), "sqlite.db")
+ conn, err := sql.Open("sqlite3", p)
+- db, err := NewDatabase(conn, true)
++ db, err := NewDatabase(conn)
+ if err != nil {
+ t.Fatal(err)
+ }
9 years, 4 months
[kubernetes/f20] Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
by Eric Paris
commit e6357b8e57e43223ec10c9b4a6a968157f44028c
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Dec 2 09:57:54 2014 -0500
Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
.gitignore | 5 +++++
getsource.sh | 9 ++++++---
kubernetes.spec | 29 +++++++++++++++++++++++------
sources | 2 +-
4 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1179529..cf31e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,8 @@
/kubernetes-df0981b.tar.gz
/kubernetes-c6158b8.tar.gz
/kubernetes-3f74a1e.tar.gz
+/kubernetes-162e498.tar.gz
+/kubernetes-64e07f7.tar.gz
+/kubernetes-ff1e9f4.tar.gz
+/kubernetes-6aabd98.tar.gz
+/kubernetes-993ef88.tar.gz
diff --git a/getsource.sh b/getsource.sh
index 72ff28d..e3ee6cd 100755
--- a/getsource.sh
+++ b/getsource.sh
@@ -16,9 +16,12 @@ since_tag=0
if [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
git_major=${BASH_REMATCH[1]}
git_minor=${BASH_REMATCH[2]}
- if [[ -n "${BASH_REMATCH[3]}" ]]; then
- since_tag=${BASH_REMATCH[3]}
- fi
+ since_tag=${BASH_REMATCH[3]}
+# handle version like 0.4.2 (although we just ignore the .2 portion...)
+elif [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
+ git_major=${BASH_REMATCH[1]}
+ git_minor=${BASH_REMATCH[2]}
+ since_tag=${BASH_REMATCH[4]}
fi
#put the git hash in as the commit
diff --git a/kubernetes.spec b/kubernetes.spec
index 94f251f..39972d4 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit 3f74a1e9f56b3c3502762930c0c551ccab0557ea
+%global commit 993ef88eec9012b221f79abe8f2932ee97997d28
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -10,8 +10,8 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.5
-Release: 105.0.git%{shortcommit}%{?dist}
+Version: 0.6
+Release: 4.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -30,17 +30,18 @@ Requires: docker-io
%endif
Requires: etcd
-Requires: cadvisor
Requires(pre): shadow-utils
BuildRequires: git
BuildRequires: golang >= 1.2-7
BuildRequires: systemd
-BuildRequires: golang-cover
BuildRequires: etcd
%if 0%{?fedora}
+# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
+BuildRequires: golang-cover
+
BuildRequires: golang(code.google.com/p/gcfg)
BuildRequires: golang(code.google.com/p/goauth2)
BuildRequires: golang(code.google.com/p/go.net/context)
@@ -78,8 +79,9 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%autosetup -Sgit -n %{name}-%{commit}
%build
+export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-105-g3f74a1e9f56b3c
+export KUBE_GIT_VERSION=v0.6.0-4-g993ef88eec9012
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -178,6 +180,21 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Tue Dec 02 2014 Eric Paris <eparis(a)redhat.com> - 0.6-4.0.git993ef88
+- Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
+
+* Mon Dec 01 2014 Eric Paris <eparis(a)redhat.com> - 0.5-235.0.git6aabd98
+- Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
+
+* Wed Nov 26 2014 Eric Paris <eparis(a)redhat.com> - 0.5-210.0.gitff1e9f4
+- Bump to upstream ff1e9f4c191342c24974c030e82aceaff8ea9c24
+
+* Tue Nov 25 2014 Eric Paris <eparis(a)redhat.com> - 0.5-174.0.git64e07f7
+- Bump to upstream 64e07f7fe03d8692c685b09770c45f364967a119
+
+* Mon Nov 24 2014 Eric Paris <eparis(a)redhat.com> - 0.5-125.0.git162e498
+- Bump to upstream 162e4983b947d2f6f858ca7607869d70627f5dff
+
* Fri Nov 21 2014 Eric Paris <eparis(a)redhat.com> - 0.5-105.0.git3f74a1e
- Bump to upstream 3f74a1e9f56b3c3502762930c0c551ccab0557ea
diff --git a/sources b/sources
index a3d418a..da6d8b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-745bef6dd02806616562a223fb0d7403 kubernetes-3f74a1e.tar.gz
+c3e0eb40b413ddcff06b2f9e3754e4be kubernetes-993ef88.tar.gz
9 years, 4 months
[kubernetes/f21] Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
by Eric Paris
commit 054362314d33ec382c1c398ec72062a10e94f8b3
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Dec 2 09:56:30 2014 -0500
Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
.gitignore | 5 +++++
getsource.sh | 9 ++++++---
kubernetes.spec | 29 +++++++++++++++++++++++------
sources | 2 +-
4 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1179529..cf31e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,8 @@
/kubernetes-df0981b.tar.gz
/kubernetes-c6158b8.tar.gz
/kubernetes-3f74a1e.tar.gz
+/kubernetes-162e498.tar.gz
+/kubernetes-64e07f7.tar.gz
+/kubernetes-ff1e9f4.tar.gz
+/kubernetes-6aabd98.tar.gz
+/kubernetes-993ef88.tar.gz
diff --git a/getsource.sh b/getsource.sh
index 72ff28d..e3ee6cd 100755
--- a/getsource.sh
+++ b/getsource.sh
@@ -16,9 +16,12 @@ since_tag=0
if [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
git_major=${BASH_REMATCH[1]}
git_minor=${BASH_REMATCH[2]}
- if [[ -n "${BASH_REMATCH[3]}" ]]; then
- since_tag=${BASH_REMATCH[3]}
- fi
+ since_tag=${BASH_REMATCH[3]}
+# handle version like 0.4.2 (although we just ignore the .2 portion...)
+elif [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
+ git_major=${BASH_REMATCH[1]}
+ git_minor=${BASH_REMATCH[2]}
+ since_tag=${BASH_REMATCH[4]}
fi
#put the git hash in as the commit
diff --git a/kubernetes.spec b/kubernetes.spec
index 94f251f..39972d4 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit 3f74a1e9f56b3c3502762930c0c551ccab0557ea
+%global commit 993ef88eec9012b221f79abe8f2932ee97997d28
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -10,8 +10,8 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.5
-Release: 105.0.git%{shortcommit}%{?dist}
+Version: 0.6
+Release: 4.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -30,17 +30,18 @@ Requires: docker-io
%endif
Requires: etcd
-Requires: cadvisor
Requires(pre): shadow-utils
BuildRequires: git
BuildRequires: golang >= 1.2-7
BuildRequires: systemd
-BuildRequires: golang-cover
BuildRequires: etcd
%if 0%{?fedora}
+# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
+BuildRequires: golang-cover
+
BuildRequires: golang(code.google.com/p/gcfg)
BuildRequires: golang(code.google.com/p/goauth2)
BuildRequires: golang(code.google.com/p/go.net/context)
@@ -78,8 +79,9 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%autosetup -Sgit -n %{name}-%{commit}
%build
+export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-105-g3f74a1e9f56b3c
+export KUBE_GIT_VERSION=v0.6.0-4-g993ef88eec9012
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -178,6 +180,21 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Tue Dec 02 2014 Eric Paris <eparis(a)redhat.com> - 0.6-4.0.git993ef88
+- Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
+
+* Mon Dec 01 2014 Eric Paris <eparis(a)redhat.com> - 0.5-235.0.git6aabd98
+- Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
+
+* Wed Nov 26 2014 Eric Paris <eparis(a)redhat.com> - 0.5-210.0.gitff1e9f4
+- Bump to upstream ff1e9f4c191342c24974c030e82aceaff8ea9c24
+
+* Tue Nov 25 2014 Eric Paris <eparis(a)redhat.com> - 0.5-174.0.git64e07f7
+- Bump to upstream 64e07f7fe03d8692c685b09770c45f364967a119
+
+* Mon Nov 24 2014 Eric Paris <eparis(a)redhat.com> - 0.5-125.0.git162e498
+- Bump to upstream 162e4983b947d2f6f858ca7607869d70627f5dff
+
* Fri Nov 21 2014 Eric Paris <eparis(a)redhat.com> - 0.5-105.0.git3f74a1e
- Bump to upstream 3f74a1e9f56b3c3502762930c0c551ccab0557ea
diff --git a/sources b/sources
index a3d418a..da6d8b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-745bef6dd02806616562a223fb0d7403 kubernetes-3f74a1e.tar.gz
+c3e0eb40b413ddcff06b2f9e3754e4be kubernetes-993ef88.tar.gz
9 years, 4 months
[kubernetes] Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
by Eric Paris
commit 3301c67ce5d8149b96998f04f713984005f28c64
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Dec 2 09:55:21 2014 -0500
Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
.gitignore | 1 +
getsource.sh | 9 ++++++---
kubernetes.spec | 11 +++++++----
sources | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46589e8..cf31e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/kubernetes-64e07f7.tar.gz
/kubernetes-ff1e9f4.tar.gz
/kubernetes-6aabd98.tar.gz
+/kubernetes-993ef88.tar.gz
diff --git a/getsource.sh b/getsource.sh
index 72ff28d..e3ee6cd 100755
--- a/getsource.sh
+++ b/getsource.sh
@@ -16,9 +16,12 @@ since_tag=0
if [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
git_major=${BASH_REMATCH[1]}
git_minor=${BASH_REMATCH[2]}
- if [[ -n "${BASH_REMATCH[3]}" ]]; then
- since_tag=${BASH_REMATCH[3]}
- fi
+ since_tag=${BASH_REMATCH[3]}
+# handle version like 0.4.2 (although we just ignore the .2 portion...)
+elif [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
+ git_major=${BASH_REMATCH[1]}
+ git_minor=${BASH_REMATCH[2]}
+ since_tag=${BASH_REMATCH[4]}
fi
#put the git hash in as the commit
diff --git a/kubernetes.spec b/kubernetes.spec
index 21ee75a..39972d4 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit 6aabd9804fb75764b70e9172774002d4febcae34
+%global commit 993ef88eec9012b221f79abe8f2932ee97997d28
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -10,8 +10,8 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.5
-Release: 235.0.git%{shortcommit}%{?dist}
+Version: 0.6
+Release: 4.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -81,7 +81,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-235-g6aabd9804fb757
+export KUBE_GIT_VERSION=v0.6.0-4-g993ef88eec9012
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -180,6 +180,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Tue Dec 02 2014 Eric Paris <eparis(a)redhat.com> - 0.6-4.0.git993ef88
+- Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
+
* Mon Dec 01 2014 Eric Paris <eparis(a)redhat.com> - 0.5-235.0.git6aabd98
- Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
diff --git a/sources b/sources
index 8cff684..da6d8b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96abb05fe028f4c528a99bdb6897c7a4 kubernetes-6aabd98.tar.gz
+c3e0eb40b413ddcff06b2f9e3754e4be kubernetes-993ef88.tar.gz
9 years, 4 months
