Hi folks,

Hmm, lots of proposed patches on this one. :)  Well, upgrading directly from
woody to etch is not supported, but it's possible for a user to have removed
the woody version of the package without purging it, and then install the
etch version, and perhaps that would trigger this code path. <test, test>
yes, it does.
So it's possible that even in a supported path, the user will have an
uncommented apt-proxy entry in /etc/inetd.conf (because woody's apt-proxy
only handles /etc/inetd.conf on purge), which ideally we will handle here to
prevent having an active inetd.conf entry pointing at a program that's not
prepared to handle it.

Thus, since current update-inetd handles reloading of the inetd.conf
already, and there is no reason to explicitly depend on update-inetd (if
update-inetd is not installed, neither is inetd, so no upgrade handling is
required), I think the best patch here is to just drop the extra call to
invoke-rc.d.

This patch is attached, and an NMU will be uploaded to incoming shortly.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -Nru /tmp/gN2tJXgpK4/apt-proxy-1.9.35/debian/changelog /tmp/O1paL9cJ9P/apt-proxy-1.9.35/debian/changelog
--- /tmp/gN2tJXgpK4/apt-proxy-1.9.35/debian/changelog	2007-01-27 06:52:58.000000000 -0800
+++ /tmp/O1paL9cJ9P/apt-proxy-1.9.35/debian/changelog	2007-03-11 20:00:20.000000000 -0700
@@ -1,3 +1,14 @@
+apt-proxy (1.9.35-0.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Don't invoke the inetd init script on upgrade from ancient versions,
+    update-inetd will already handle this for us.  Thanks to Marco
+    Presi, Peter Green, Damyan Ivanov, and Ben Hutchings for their work
+    on figuring out this bug.  Closes: #412387.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sun, 11 Mar 2007 19:58:12 -0700
+
 apt-proxy (1.9.35-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru /tmp/gN2tJXgpK4/apt-proxy-1.9.35/debian/postinst /tmp/O1paL9cJ9P/apt-proxy-1.9.35/debian/postinst
--- /tmp/gN2tJXgpK4/apt-proxy-1.9.35/debian/postinst	2006-08-03 16:54:46.000000000 -0700
+++ /tmp/O1paL9cJ9P/apt-proxy-1.9.35/debian/postinst	2007-03-11 20:00:30.000000000 -0700
@@ -34,7 +34,6 @@
             if [ -x /usr/sbin/update-inetd ]; then
               echo "Disabling inetd's apt-proxy v1 line."
               update-inetd --comment-chars "#<apt-proxy-v2># " --disable 9999
-              invoke-rc.d inetd restart
             fi
             db_fset $NAME/upgrading-v2 seen false || true
             db_input medium $NAME/upgrading-v2 || true

Reply via email to