diff options
| author | Alexander Sulfrian <alex@spline.inf.fu-berlin.de> | 2014-11-15 21:27:34 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alex@spline.inf.fu-berlin.de> | 2014-11-15 21:27:34 +0100 |
| commit | 357a74066ec29886f24bd8f72df51610a330212c (patch) | |
| tree | c8a0db560d44ccf25b3d8558b6ada96e30e13caf | |
| parent | 052958b91091983b402d78437c85b725ed3be01b (diff) | |
| download | bcfg2-tools-357a74066ec29886f24bd8f72df51610a330212c.tar.gz bcfg2-tools-357a74066ec29886f24bd8f72df51610a330212c.tar.bz2 bcfg2-tools-357a74066ec29886f24bd8f72df51610a330212c.zip | |
renew-config: allow update of Metadata/clients.xml
We use metadata database now, so we can update Metadata/clients.xml
from the repo.
| -rwxr-xr-x | renew-config | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/renew-config b/renew-config index f90fdd3..e9aea35 100755 --- a/renew-config +++ b/renew-config @@ -12,17 +12,9 @@ fi git push origin master 2>/dev/null -if ! diff -q "$REPO/Metadata/clients.xml" "$REAL/Metadata/clients.xml" >/dev/null; then - echo "$REPO: Metadata/clients.xml out of date." 1>&2 - echo "You probably should update it with $REAL/Metadata/clients.xml" 1>&2 - echo 1>&2 - $DIFF -u "$REPO/Metadata/clients.xml" "$REAL/Metadata/clients.xml" 1>&2 - echo 1>&2 - echo "Maybe you want:" 1>&2 - error "cp -i '$REAL/Metadata/clients.xml' '$REPO/Metadata/clients.xml'" -fi - -if [ -n "$(git rev-list HEAD..origin/master)" ]; then +# check if remote is up to date +git fetch git@git.spline.de:bcfg2-repository +if [ -n "$(git rev-list HEAD..FETCH_HEAD)" ]; then error "$REPO: HEAD does not equal to origin/master." fi |