From edac789aafd26d093d5c70120e983fc852193517 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Mon, 27 Oct 2003 17:06:44 +0000 Subject: [PATCH] Don't assume /usr/info/dir exists if /usr/info does. --- ChangeLog | 5 +++++ debian/changelog | 2 ++ debian/dpkg.postinst | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0f4732c2..1175cab8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 27 11:06:25 CST 2003 Adam Heath + + * debian/dpkg.postinst: Don't assume /usr/info/dir exists if /usr/info + does. + Mon Oct 27 10:57:54 CST 2003 Adam Heath * scripts/dpkg-source.pl: Add .#* to the default ignore filter. diff --git a/debian/changelog b/debian/changelog index ab19b01f..d46e6966 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ dpkg (1.10.17) unstable; urgency=medium Add -u in dpkg-scanpackages. Closes: #214123. Add -a command to dpkg-scanpackages. * Add .#* to dpkg-source's default ignore filter. Closes: #217380. + * Matthias Urlichs : + Don't assume /usr/info/dir exists if /usr/info does. Closes: #165770. -- Wichert Akkerman UNRELEASED diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index b29de472..38d7f196 100755 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -114,7 +114,8 @@ OK. esac fi -if [ -d /usr/info -a ! -L /usr/info -a ! -L /usr/info/dir ]; then +if [ -d /usr/info -a ! -L /usr/info -a ! -L /usr/info/dir \ + -a -f /usr/info/dir ]; then echo Moving /usr/info/dir to /usr/share/info/dir. mv /usr/info/dir /usr/share/info/dir if [ -f /usr/info/dir.old ]; then -- 2.39.5