Bläddra i källkod

[annex] version 5 md5

cgars 8 år sedan
förälder
incheckning
bc813c245a
3 ändrade filer med 11 tillägg och 5 borttagningar
  1. 2 2
      models/repo_editor.go
  2. 6 0
      vendor/github.com/G-Node/go-annex/add.go
  3. 3 3
      vendor/vendor.json

+ 2 - 2
models/repo_editor.go

@@ -486,11 +486,11 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
 			if finfo.Size() > setting.Repository.Upload.AnexFileMinSize*gannex.MEGABYTE {
 				log.Trace("This file should be annexed: %s", upload.Name)
 				// annex init in case it isnt yet
-				if msg, err := gannex.AInit(localPath); err != nil {
+				if msg, err := gannex.AInit(localPath, "annex.backend"); err != nil {
 					log.Error(1, "Annex init failed with error: %v,%s,%s", err, msg, repoFileName)
 				}
 				// worm for compatibility
-				gannex.Worm(localPath)
+				gannex.Md5(localPath)
 				if msg, err := gannex.Add(repoFileName, localPath); err != nil {
 					log.Error(1, "Annex add failed with error: %v,%s,%s", err, msg, repoFileName)
 				}

+ 6 - 0
vendor/github.com/G-Node/go-annex/add.go

@@ -28,11 +28,17 @@ func AUInit(dir string, args ...string) (string, error) {
 	cmd := git.NewACommand("uninit")
 	return cmd.AddArguments(args...).RunInDir(dir)
 }
+
 func Worm(dir string) (string, error) {
 	cmd := git.NewCommand("config", "annex.backends", "WORM")
 	return cmd.RunInDir(dir)
 }
 
+func Md5(dir string) (string, error) {
+	cmd := git.NewCommand("config", "annex.backends", "MD5")
+	return cmd.RunInDir(dir)
+}
+
 func ASync(dir string, args ...string) (string, error) {
 	cmd := git.NewACommand("sync")
 	return cmd.AddArguments(args...).RunInDir(dir)

+ 3 - 3
vendor/vendor.json

@@ -9,10 +9,10 @@
 			"revisionTime": "2017-07-11T12:59:03Z"
 		},
 		{
-			"checksumSHA1": "vjZdri9BVeaL5W9Py2wdIAj35qQ=",
+			"checksumSHA1": "pzrNRxutz5V0VPD/eqgqYs6Mj4o=",
 			"path": "github.com/G-Node/go-annex",
-			"revision": "3cd728fddc604d7cd4b9b74ff6780a9d67aa1d12",
-			"revisionTime": "2017-07-11T13:07:39Z"
+			"revision": "f44cb4a8236be506a35a47ea3da591c0b2bb58de",
+			"revisionTime": "2017-07-13T18:18:00Z"
 		},
 		{
 			"checksumSHA1": "IyfS7Rbl6OgR83QR7TOfKdDCq+M=",