Merge lp://staging/~racb/squid-deb-proxy/apt_refresh into lp://staging/squid-deb-proxy
Proposed by
Robie Basak
| Status: | Merged |
|---|---|
| Approved by: | Michael Vogt |
| Approved revision: | 16 |
| Merge reported by: | Michael Vogt |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~racb/squid-deb-proxy/apt_refresh |
| Merge into: | lp://staging/squid-deb-proxy |
| Diff against target: |
1529 lines (+1334/-0) (has conflicts) 34 files modified
.bzr-builddeb/default.conf (+2/-0) 30autoproxy (+1/-0) Makefile (+22/-0) README (+19/-0) README.autogenerated (+2/-0) allowed-networks-src.acl (+12/-0) apt-avahi-discover (+12/-0) avahi/Makefile (+10/-0) avahi/README (+2/-0) avahi/find_squid_deb_proxy.c (+232/-0) contrib/squid-deb-proxy.init (+185/-0) debian/changelog (+192/-0) debian/compat (+1/-0) debian/control (+52/-0) debian/copyright (+14/-0) debian/po/POTFILES.in (+1/-0) debian/po/templates.pot (+48/-0) debian/postrm (+12/-0) debian/preinst (+54/-0) debian/rules (+8/-0) debian/squid-deb-proxy-client-udeb.dirs (+1/-0) debian/squid-deb-proxy-client-udeb.install (+1/-0) debian/squid-deb-proxy-client.install (+2/-0) debian/squid-deb-proxy.config (+11/-0) debian/squid-deb-proxy.install (+1/-0) debian/squid-deb-proxy.logrotate (+15/-0) debian/squid-deb-proxy.postinst (+131/-0) debian/squid-deb-proxy.postrm (+11/-0) debian/squid-deb-proxy.templates (+16/-0) debian/squid-deb-proxy.upstart (+105/-0) mirror-dstdomain.acl (+21/-0) squid-deb-proxy.conf (+93/-0) tests/test_acl.sh (+36/-0) udeb/80squid-deb-proxy-client (+9/-0) Conflict adding file .bzr-builddeb. Moved existing file to .bzr-builddeb.moved. Conflict adding file 30autoproxy. Moved existing file to 30autoproxy.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file README.autogenerated. Moved existing file to README.autogenerated.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file allowed-networks-src.acl. Moved existing file to allowed-networks-src.acl.moved. Conflict adding file apt-avahi-discover. Moved existing file to apt-avahi-discover.moved. Conflict adding file avahi. Moved existing file to avahi.moved. Conflict adding file contrib. Moved existing file to contrib.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file mirror-dstdomain.acl. Moved existing file to mirror-dstdomain.acl.moved. Conflict adding file squid-deb-proxy.conf. Moved existing file to squid-deb-proxy.conf.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file udeb. Moved existing file to udeb.moved. |
| To merge this branch: | bzr merge lp://staging/~racb/squid-deb-proxy/apt_refresh |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Always check to see if Release and Package files have been updated. If they have not changed, they can still be served from the cache, but this way the archive is always consulted. This should eliminate any possibility of apt errors due to the cache being in the middle. Other general apt issues (like squid accessing different mirrors which are skewed, or skew in between fetching Release and Package files, or skew in mirrors between updating Package and Release files, remain).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks, I manually merged this into trunk now (as the branches are incompatible, probably ubuntu vs upstream branch problem :-/