Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
8ce7ce5d
by Joerg Jaspert at 2018-04-06T18:12:46+02:00
2 changed files:
Changes:
| ... | ... | @@ -32,9 +32,9 @@ function check_for_db_update() { |
| 32 | 32 |
declare -r NEWDBVER=${NEWDBVER%%.py}
|
| 33 | 33 |
fi
|
| 34 | 34 |
|
| 35 |
- if [[ ${OLDDBVER} -ne ${NEWDBVER} ]] && [[ -z ${DODB:-""} ]]; then
|
|
| 36 |
- # Differing versions and no DODB variable, break
|
|
| 37 |
- log_error "Database update from ${OLDDBVER} to ${NEWDBVER} required, will not update dak code on ${HOSTNAME} unless told with DODB=1 in the environment"
|
|
| 35 |
+ if [[ ${OLDDBVER} -ne ${NEWDBVER} ]] && [[ -z ${FORCETHISDAMNUPGRADEIKNOWWHATIDOIHOPE:-""} ]]; then
|
|
| 36 |
+ # Differing versions and no FORCETHISDAMNUPGRADEIKNOWWHATIDOIHOPE variable, break
|
|
| 37 |
+ log_error "Database update from ${OLDDBVER} to ${NEWDBVER} required, will not update dak code on ${HOSTNAME} unless told with FORCETHISDAMNUPGRADEIKNOWWHATIDOIHOPE=1 in the environment"
|
|
| 38 | 38 |
exit 21
|
| 39 | 39 |
fi
|
| 40 | 40 |
}
|
| ... | ... | @@ -49,7 +49,7 @@ LOCK_STOP="${lockdir}/archive.stop" |
| 49 | 49 |
TIMESTAMP=false
|
| 50 | 50 |
|
| 51 | 51 |
# And the following types of cronscripts exists
|
| 52 |
-declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror)'
|
|
| 52 |
+declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror|deploy)'
|
|
| 53 | 53 |
declare -r HOSTNAME=$(hostname -s)
|
| 54 | 54 |
|
| 55 | 55 |
archs=$(dak admin a list | tr '\n' ' ')
|