diff options
| author | Joey Hess <joey@kitenet.net> | 2012-08-30 12:01:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-30 12:01:41 -0400 |
| commit | b29cdafefe70aaeee919305543466abca09bcd4b (patch) | |
| tree | a4899a5a081dfb4bcbc586ddb82dee67d78969d8 /autoscripts | |
| parent | 00250d8cd20a37be362850d3ed8a652b0768455f (diff) | |
| parent | b3c00de156adf9c52da3cd0fa7c46414d5eb6982 (diff) | |
Merge branch 'wheezy'
Diffstat (limited to 'autoscripts')
| -rw-r--r-- | autoscripts/preinst-sgmlcatalog | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/autoscripts/preinst-sgmlcatalog b/autoscripts/preinst-sgmlcatalog index 41f55d6d..96f06738 100644 --- a/autoscripts/preinst-sgmlcatalog +++ b/autoscripts/preinst-sgmlcatalog @@ -1,7 +1,8 @@ -if [ "$1" = "upgrade" ] && ! dpkg-query -S #CENTRALCAT# >/dev/null 2>&1; then +if test -f #CENTRALCAT# -a "(" "$1" = "upgrade" -o "$1" = "install" -a -n "$2" ")" && + ! dpkg-query -S #CENTRALCAT# >/dev/null 2>&1; then # If the dpkg-query command returns non-zero, the central catalog is # not owned by any package. This is due to an old behaviour of # debhelper. Now that file becomes a conffile. In order to avoid a # question during installation, we remove the old non-conffile. - rm -f #CENTRALCAT# + mv #CENTRALCAT# #CENTRALCAT#.old fi |