more init fixes

This commit is contained in:
David Lawrence 2015-04-29 11:27:16 -07:00
parent 7bce36a2c5
commit 7f5250b604
3 changed files with 17 additions and 17 deletions

2
Godeps/Godeps.json generated
View File

@ -28,7 +28,7 @@
},
{
"ImportPath": "github.com/endophage/go-tuf",
"Rev": "ab9152fd5c06cac77b744c45accd0c5accc09e19"
"Rev": "73f8528774f93cfe707851ab2ff7503a8756ff4b"
},
{
"ImportPath": "github.com/golang/protobuf/proto",

View File

@ -80,6 +80,22 @@ func (r *Repo) Init(consistentSnapshot bool) error {
if err != nil {
return err
}
_, err = r.GenKey("root")
if err != nil {
return err
}
_, err = r.GenKey("targets")
if err != nil {
return err
}
_, err = r.GenKey("snapshot")
if err != nil {
return err
}
_, err = r.GenKey("timestamp")
if err != nil {
return err
}
t.Expires = data.DefaultExpires("targets").Round(time.Second)
t.Version++
err = r.setMeta("targets.json", t)

View File

@ -191,22 +191,6 @@ func GenKeysHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *
Err: err,
}
}
_, err = tufRepo.GenKey("root")
if err != nil {
log.Println(err)
}
_, err = tufRepo.GenKey("targets")
if err != nil {
log.Println(err)
}
_, err = tufRepo.GenKey("snapshot")
if err != nil {
log.Println(err)
}
_, err = tufRepo.GenKey("timestamp")
if err != nil {
log.Println(err)
}
_ = tufRepo.Init(false)
return nil
}