storage/sql: fix typo in keys query

This commit is contained in:
Eric Chiang 2016-10-14 11:56:50 -07:00
parent 0a3aabc8ff
commit fe320c1928
2 changed files with 3 additions and 3 deletions

View File

@ -350,7 +350,7 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error))
set set
verification_keys = $1, verification_keys = $1,
signing_key = $2, signing_key = $2,
singing_key_pub = $3, signing_key_pub = $3,
next_rotation = $4 next_rotation = $4
where id = $5; where id = $5;
`, `,
@ -374,7 +374,7 @@ func getKeys(q querier) (keys storage.Keys, err error) {
select select
verification_keys, signing_key, signing_key_pub, next_rotation verification_keys, signing_key, signing_key_pub, next_rotation
from keys from keys
where id=$q where id=$1
`, keysRowID).Scan( `, keysRowID).Scan(
decoder(&keys.VerificationKeys), decoder(&keys.SigningKey), decoder(&keys.VerificationKeys), decoder(&keys.SigningKey),
decoder(&keys.SigningKeyPub), &keys.NextRotation, decoder(&keys.SigningKeyPub), &keys.NextRotation,

View File

@ -70,7 +70,7 @@ function wait_for_file {
} }
function wait_for_container { function wait_for_container {
while [ -z "$( rkt list --full | grep $1 )" ]; do while [ -z "$( rkt list --full | grep $1 | grep running )" ]; do
sleep 1 sleep 1
done done
} }