summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-02-18 15:17:50 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-02-18 15:17:50 +0100
commitb9dacd11a4707092f070d49b1cb1acff642eebf0 (patch)
tree8876729757ce5b5d639c13018d8fee79d308929c /apt-pkg/contrib
parentb026dbb970c71213e12caaeb47bf7a27b91ea0a0 (diff)
parentb8c42fc0632dbbe0edb0854cd941a8fc5340a94a (diff)
* [BREAK] merged lp:~mvo/apt/history
- this writes a /var/log/apt/history tagfile that contains details from the transaction (complements term.log) * methods/http.cc: - add cache-control headers even if no cache is given to allow adding options for intercepting proxies - add Acquire::http::ProxyAutoDetect configuration that can be used to call a external helper to figure out the proxy configuration and return it to apt via stdout (this is a step towards WPAD and zeroconf/avahi support) * abicheck/ - add new abitest tester using the ABI Compliance Checker from http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker * Change the package index Info methods to allow apt-cache policy to be useful when using several different archives on the same host. (Closes: #329814, LP: #22354)
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/strutl.cc12
-rw-r--r--apt-pkg/contrib/strutl.h1
2 files changed, 13 insertions, 0 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 2913fbf44..8e8820949 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1323,3 +1323,15 @@ string URI::SiteOnly(const string &URI)
return U;
}
/*}}}*/
+// URI::NoUserPassword - Return the schema, site and path for the URI /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string URI::NoUserPassword(const string &URI)
+{
+ ::URI U(URI);
+ U.User.clear();
+ U.Password.clear();
+ U.Port = 0;
+ return U;
+}
+ /*}}}*/
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 2b2e147fb..a1e7f3934 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -120,6 +120,7 @@ class URI
inline void operator =(const string &From) {CopyFrom(From);};
inline bool empty() {return Access.empty();};
static string SiteOnly(const string &URI);
+ static string NoUserPassword(const string &URI);
URI(string Path) {CopyFrom(Path);};
URI() : Port(0) {};