The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2079
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 16eae582b86066845f77f9d7c9a96a85ce50da12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 3 Jun 2016 14:54:32 -0400
Subject: [PATCH 1/2] patches: Fix DB test, we now have 17 tables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
test/suites/database_update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/suites/database_update.sh b/test/suites/database_update.sh
index d89d757..e178ee9 100644
--- a/test/suites/database_update.sh
+++ b/test/suites/database_update.sh
@@ -11,7 +11,7 @@ test_database_update(){
spawn_lxd "${LXD_MIGRATE_DIR}"
# Assert there are enough tables.
- expected_tables=16
+ expected_tables=17
tables=$(sqlite3 "${MIGRATE_DB}" ".dump" | grep -c "CREATE TABLE")
[ "${tables}" -eq "${expected_tables}" ] || { echo "FAIL: Wrong number of
tables after database migration. Found: ${tables}, expected
${expected_tables}"; false; }
From 2f63efceaadbba432624c2348507b374a74f50d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 3 Jun 2016 15:00:46 -0400
Subject: [PATCH 2/2] Makefile: go get has become worse, now need 3 runs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ran into that with the recent bugfix releases, make dist was failing,
doing one more go get fixed it...
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index edc11ed..2b08f8e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@ ARCHIVE=lxd-$(VERSION).tar
.PHONY: default
default:
- # Must run twice due to go get race
+ # Must a few times due to go get race
+ -go get -t -v -d ./...
-go get -t -v -d ./...
-go get -t -v -d ./...
go install -v $(DEBUG) ./...
@@ -20,7 +21,8 @@ default:
.PHONY: client
client:
- # Must run twice due to go get race
+ # Must a few times due to go get race
+ -go get -t -v -d ./...
-go get -t -v -d ./...
-go get -t -v -d ./...
go install -v $(DEBUG) ./lxc
@@ -28,7 +30,8 @@ client:
.PHONY: update
update:
- # Must run twice due to go get race
+ # Must a few times due to go get race
+ -go get -t -v -d -u ./...
-go get -t -v -d -u ./...
go get -t -v -d -u ./...
@echo "Dependencies updated"
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
