From: joey <joey>
Date: Thu, 14 Apr 2005 15:38:36 +0000 (+0000)
Subject: r1746:   * dh_installmodules autoscripts: Now that return code 3 is allocated by
X-Git-Tag: 4.2.33~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d5453631808c4af4f985f5dacc74b77b68624c30;p=debhelper.git

r1746:   * dh_installmodules autoscripts: Now that return code 3 is allocated by
    update-modules to indicate /etc/modules.conf is not automatically
    generated, we can ignore that return code since it's not a condition that
    should fail an installation. Closes: #165400
---

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index babf39b..f2342da 100644
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,3 +1,3 @@
 if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
-	update-modules >/dev/null
+	update-modules >/dev/null || [ "$?" = 3 ]
 fi
diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
index f2d4cb7..804f632 100644
--- a/autoscripts/postrm-modules
+++ b/autoscripts/postrm-modules
@@ -1,3 +1,3 @@
 if [ -x /sbin/update-modules ]; then
-	update-modules >/dev/null
+	update-modules >/dev/null || [ "$?" = 3]
 fi
diff --git a/debian/changelog b/debian/changelog
index e93b37a..3e23321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 debhelper (4.2.33) UNRELEASED; urgency=low
 
   * Update Spanish translation of dh_clean man page. Closes: #303052
+  * dh_installmodules autoscripts: Now that return code 3 is allocated by
+    update-modules to indicate /etc/modules.conf is not automatically
+    generated, we can ignore that return code since it's not a condition that
+    should fail an installation. Closes: #165400
 
  -- Joey Hess <joeyh@debian.org>  Sat,  9 Apr 2005 17:27:12 -0400