Please allow apt-proxy 1.9.30 back into testing
apt-proxy 1.9.28 was removed due to RC bug #304182, where the conversion
script for the version in woody produced a broken config. Otavio uploaded
1.9.29, but that also contained other updates - translations, manpages and
documentation.
Given your last announcement saying you want changes to be small, I have
reverted everything except for two fixes. The RC bug fix is a one liner:
-timeout="timeout = ${RSYNC_TIMEOUT:30}"
+timeout="timeout = ${RSYNC_TIMEOUT:-30}"
The second fix makes apt-proxy-import and the max_versions feature work again.
I commented a section of code out in 1.9.23, thinking it was implementing an
unrelated feature, but this stopped package database updates and thus a-p-i
from working. I have reactivated the section, which has not changed since
2002 and has therefore seen plenty of testing in the past.
I attach the debdiff from 1.9.28 to 1.9.30.
Thanks and sorry this is so late
Chris
diff -Nru /tmp/ywIim4d6kS/apt-proxy-1.9.28/apt_proxy/apt_proxy.py /tmp/pPey3psMZe/apt-proxy-1.9.30/apt_proxy/apt_proxy.py
--- /tmp/ywIim4d6kS/apt-proxy-1.9.28/apt_proxy/apt_proxy.py 2005-03-03 16:19:37.000000000 +0000
+++ /tmp/pPey3psMZe/apt-proxy-1.9.30/apt_proxy/apt_proxy.py 2005-05-19 17:41:18.000000000 +0100
@@ -1420,20 +1420,19 @@
log.debug(msg, 'fetch_real')
fetcher = dummyFetcher.apEndTransfer(fetcher_class)
- # Postconvert routine disabled until properly debugged
-# if (fetcher and fetcher.post_convert.search(req.uri)
-# and not running.has_key(req.uri[:-3])):
-# log.debug("post converting: "+req.uri,'convert')
-# loop = LoopbackRequest(req)
-# loop.uri = req.uri[:-3]
-# loop.local_file = req.local_file[:-3]
-# loop.process()
-# loop.serve_if_cached=0
-# #FetcherGzip will attach as a request of the
-# #original Fetcher, efectively waiting for the
-# #original file if needed
-# gzip = FetcherGzip()
-# gzip.activate(loop, postconverting=1)
+ if (fetcher and fetcher.post_convert.search(req.uri)
+ and not running.has_key(req.uri[:-3])):
+ log.debug("post converting: "+req.uri,'convert')
+ loop = LoopbackRequest(req)
+ loop.uri = req.uri[:-3]
+ loop.local_file = req.local_file[:-3]
+ loop.process()
+ loop.serve_if_cached=0
+ #FetcherGzip will attach as a request of the
+ #original Fetcher, efectively waiting for the
+ #original file if needed
+ gzip = FetcherGzip()
+ gzip.activate(loop, postconverting=1)
self.serve_if_cached = serve_cached
running = self.factory.runningFetchers
diff -Nru /tmp/ywIim4d6kS/apt-proxy-1.9.28/bin/apt-proxy-v1tov2 /tmp/pPey3psMZe/apt-proxy-1.9.30/bin/apt-proxy-v1tov2
--- /tmp/ywIim4d6kS/apt-proxy-1.9.28/bin/apt-proxy-v1tov2 2004-09-18 15:39:14.000000000 +0100
+++ /tmp/pPey3psMZe/apt-proxy-1.9.30/bin/apt-proxy-v1tov2 2005-04-24 23:43:28.000000000 +0100
@@ -81,7 +81,7 @@
if [ -n "${WGET_TIMEOUT}" ] && [ "${RSYNC_TIMEOUT}" != "${WGET_TIMEOUT}" ]; then
warn "WGET_TIMEOUT differs from RSYNC_TIMEOUT, using RSYNC_TIMEOUT"
fi
-timeout="timeout = ${RSYNC_TIMEOUT:30}"
+timeout="timeout = ${RSYNC_TIMEOUT:-30}"
cache_dir="cache_dir = ${APT_PROXY_CACHE}"
diff -Nru /tmp/ywIim4d6kS/apt-proxy-1.9.28/debian/changelog /tmp/pPey3psMZe/apt-proxy-1.9.30/debian/changelog
--- /tmp/ywIim4d6kS/apt-proxy-1.9.28/debian/changelog 2005-03-03 15:18:35.000000000 +0000
+++ /tmp/pPey3psMZe/apt-proxy-1.9.30/debian/changelog 2005-05-19 17:41:18.000000000 +0100
@@ -1,3 +1,40 @@
+apt-proxy (1.9.30) unstable; urgency=high
+
+ * Back out all changes in 1.9.29 except for the fix for
+ #304182, the RC bug that caused apt-proxy to be removed from
+ Sarge
+ * Re-enable gunzip postprocessing for Packages, needed for
+ packages database to work properly. This code was commented out
+ in 1.9.23 because I thought it was related to another problem.
+ Closes: #277916: /usr/sbin/apt-proxy-import: apt-proxy-import
+ doesn't work- no suitable backend found
+ Closes: #285792: apt-proxy-import does not work
+ Closes: #305015: max_versions not respected - keeps many versions
+ more than defined there
+
+ -- Chris Halls <halls@debian.org> Thu, 19 May 2005 17:28:33 +0100
+
+apt-proxy (1.9.29) unstable; urgency=low
+
+ * Hey, we moved to Alioth and Subversion :-D (Otavio)
+ * Apply patch provided by Patrick B. Carlisle <carlislp@reed.edu> to fix
+ the empty timeout value in conversion. Closes: #304182 (Otavio)
+ * Apply patch provided by Achim Bohnet <ach@mpe.mpg.de> to improve the
+ manpages. Closes: #299682 (Otavio)
+ * Add a doc giving tips how to use it offline. Thanks for Achim Bohnet
+ <ach@mpe.mpg.de> by it. Closes: #299675 (Otavio)
+ * Fix the option handle of apt-proxy-import to display its version
+ instead of Twisted one. Closes: #308666 (Otavio)
+ * Fix a spelling error on template. Closes: 308930 (Otavio)
+ * Debconf Translations:
+ - Vietnamese (vi.po) by Clytie Siddall <clytie@riverland.net.au>.
+ Closes: 308814 (Otavio)
+ * Manpage Translations:
+ - French (fr.po) by Christian Perrier <bubulle@debian.org>.
+ Closes: 300172 (Otavio)
+
+ -- Otavio Salvador <otavio@debian.org> Mon, 16 May 2005 01:29:14 -0300
+
apt-proxy (1.9.28) unstable; urgency=low
* Fix exception in dynamic backends. Closes: #296513
Reply to: