Parcourir la source

Don't assume /usr/info/dir exists if /usr/info does.

Adam Heath il y a 23 ans
Parent
commit
edac789aaf
3 fichiers modifiés avec 9 ajouts et 1 suppressions
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 1
      debian/dpkg.postinst

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Mon Oct 27 11:06:25 CST 2003 Adam Heath <doogie@debian.org>
+
+  * debian/dpkg.postinst: Don't assume /usr/info/dir exists if /usr/info
+    does.
+
 Mon Oct 27 10:57:54 CST 2003 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-source.pl: Add .#* to the default ignore filter.

+ 2 - 0
debian/changelog

@@ -10,6 +10,8 @@ dpkg (1.10.17) unstable; urgency=medium
     Add -u in dpkg-scanpackages.  Closes: #214123.
     Add -a<arch> command to dpkg-scanpackages.
   * Add .#* to dpkg-source's default ignore filter.  Closes: #217380.
+  * Matthias Urlichs <smurf@smurf.noris.de>:
+    Don't assume /usr/info/dir exists if /usr/info does.  Closes: #165770.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

+ 2 - 1
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