From a54ab23371a9475fb03bad10f7fcb400ce8fc60c Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Wed, 25 Jan 2017 02:51:41 +0100 Subject: [PATCH 1/2] migrations: update dist.ipfs.io path License: MIT Signed-off-by: Lars Gierth --- repo/fsrepo/migrations/migrations.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/fsrepo/migrations/migrations.go b/repo/fsrepo/migrations/migrations.go index 034365af3..d1333af90 100644 --- a/repo/fsrepo/migrations/migrations.go +++ b/repo/fsrepo/migrations/migrations.go @@ -15,7 +15,7 @@ import ( "strings" ) -var DistPath = "https://ipfs.io/ipfs/QmUnvqDuRyfe7HJuiMMHv77AMUFnjGyAU28LFPeTYwGmFF" +var DistPath = "https://ipfs.io/ipfs/QmUgY7wRGB7bEKREE5BNrSwjzrRZddkRV4bu64bP2qgv7f" func init() { if dist := os.Getenv("IPFS_DIST_PATH"); dist != "" { From f28ba8559ba579f6508861929591fd6e938e2d56 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Wed, 25 Jan 2017 23:17:31 -0800 Subject: [PATCH 2/2] remove error for not having an upgrade License: MIT Signed-off-by: Jeromy --- repo/fsrepo/migrations/migrations.go | 3 --- test/sharness/t0066-migration.sh | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/repo/fsrepo/migrations/migrations.go b/repo/fsrepo/migrations/migrations.go index d1333af90..63782f8fc 100644 --- a/repo/fsrepo/migrations/migrations.go +++ b/repo/fsrepo/migrations/migrations.go @@ -35,9 +35,6 @@ func migrationsBinName() string { } func RunMigration(newv int) error { - if newv == 5 { - return fmt.Errorf("No automatic migrations yet for repo version 5. You will have to build them from source.\nSee https://github.com/ipfs/fs-repo-migrations") - } migrateBin := migrationsBinName() fmt.Println(" => Looking for suitable fs-repo-migrations binary.") diff --git a/test/sharness/t0066-migration.sh b/test/sharness/t0066-migration.sh index c5132b884..49587fe9d 100755 --- a/test/sharness/t0066-migration.sh +++ b/test/sharness/t0066-migration.sh @@ -13,7 +13,7 @@ test_init_ipfs test_expect_success "setup mock migrations" ' mkdir bin && echo "#!/bin/bash" > bin/fs-repo-migrations && - echo "echo 4" >> bin/fs-repo-migrations && + echo "echo 5" >> bin/fs-repo-migrations && chmod +x bin/fs-repo-migrations && export PATH="$(pwd)/bin":$PATH ' @@ -35,9 +35,8 @@ test_expect_success "ipfs daemon --migrate=true runs migration" ' ' test_expect_success "output looks good" ' - #grep "Running: " true_out > /dev/null && - #grep "Success: fs-repo has been migrated to version 4." true_out > /dev/null - grep "No automatic migrations yet" true_out > /dev/null + grep "Running: " true_out > /dev/null && + grep "Success: fs-repo has been migrated to version 5." true_out > /dev/null ' test_expect_success "'ipfs daemon' prompts to auto migrate" '