* apt-pkg/acquire-item.cc:

  - default to "/usr/lib/apt/apt-report-mirror-failure"
* cmdline/apt-report-mirror-failure:
  - no default comit url for now
* debian/rules:
  - move apt-report-mirror-failure into /usr/lib/apt
* doc/examples/configure-index:
  - more documentation
* methods/mirror.cc:
  - updated TODO

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 14610d6..3853015 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -154,7 +154,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
    const char *Args[40];
    unsigned int i = 0;
    string report = _config->Find("Methods::Mirror::ProblemReporting", 
-                                "/usr/bin/apt-report-mirror-failure");
+                                "/usr/lib/apt/apt-report-mirror-failure");
    if(!FileExists(report))
       return;
    Args[i++] = report.c_str();

diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure
index fb43f0e..1567e78 100755 (executable)
--- a/cmdline/apt-report-mirror-failure
+++ b/cmdline/apt-report-mirror-failure
@@ -5,8 +5,8 @@ import urllib
 import apt_pkg
 
 apt_pkg.init()
-url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures",
-                          "http://people.ubuntu.com:9000/mirror-failure")
+url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", None)
+                          #"http://people.ubuntu.com:9000/mirror-failure")
                           #"http://localhost:9000/mirror-failure")
 if not url:
     sys.exit(0)

diff --git a/cmdline/makefile b/cmdline/makefile
index f07c7da..8d284c2 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -55,6 +55,6 @@ include $(COPY_H)
 
 # The apt-key program
 SOURCE=apt-report-mirror-failure
-TO=$(LIB)
+TO=$(BIN)
 TARGET=program
 include $(COPY_H)

diff --git a/debian/rules b/debian/rules
index 02ee734..9e87b17 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -214,6 +214,10 @@ apt: build debian/shlibs.local
 
 #      head -n 500 ChangeLog > debian/ChangeLog
 
+       # move the mirror failure script in place
+       mv debian/$@/usr/bin/apt-report-mirror-failure \
+          debian/$@/usr/lib/apt/apt-report-mirror-failure \
+
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ 
        dh_installcron -p$@

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 81bb6b3..81fa4c5 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -166,6 +166,10 @@ Acquire
    RefreshInterval "360"; // refresh interval in minutes
    MaxAge "90";           // max age for a mirror file in days before 
                           // it gets deleted
+   // mirror failure reporting script
+   ProblemReporting "/usr/lib/apt/apt-report-mirror-failure"; 
+   // mirror failure reporting url
+   ReportFailures "http://example.com/mirror-failure"; 
   };
 };
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index c5c0c74..9a86a10 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -42,6 +42,7 @@ using namespace std;
  * - deal with runing as non-root because we can't write to the lists 
      dir then -> use the cached mirror file
  * - better method to download than having a pkgAcquire interface here
+ *   and better error handling there!
  * - support more than http
  * - testing :)
  */