* data/templates/Debian.info.in:

  - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673)
* python/cache.cc:
  - Throw an exception rather than segfaulting when GetCache() is called
    before InitSystem() (closes: #369147)
* doc/examples/config.py:
  - Fix config.py --help (closes: #257007)

4 files changed, 22 insertions, 8 deletions

diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index 244e1c6b..b635de19 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -3,7 +3,7 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changel
 Suite: etch
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian 4.0 'Etch' 
 Component: main
@@ -26,7 +26,7 @@ _Description: Security updates
 Suite: sarge
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian 3.1 'Sarge'
 Component: main
@@ -49,7 +49,7 @@ _Description: Security updates
 Suite: stable
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian current stable release
 Component: main
@@ -62,7 +62,7 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: testing
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian testing
 Component: main
@@ -75,7 +75,7 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: sid
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian 'Sid' (unstable)
 Component: main
diff --git a/debian/changelog b/debian/changelog
index c48bdafe..a3792386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,15 @@
 python-apt (0.7.7) unstable; urgency=low
 
+  [ Emanuele Rocca ]
+  * data/templates/Debian.info.in:
+    - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673)
+  * python/cache.cc:
+    - Throw an exception rather than segfaulting when GetCache() is called
+      before InitSystem() (closes: #369147)
+  * doc/examples/config.py:
+    - Fix config.py --help (closes: #257007)
+
+  [ Michael Vogt ]
   * python/apt_pkgmodule.cc:
     - fix bug in hashsum calculation when the original string
       contains \0 charackters (thanks to Celso Providelo and 
@@ -14,7 +24,7 @@ python-apt (0.7.7) unstable; urgency=low
   * debian/rules:
     - remove the arch-build target, we have bzr-builddeb now
 
- -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 22 Jul 2008 10:16:03 +0200
 
 python-apt (0.7.6) unstable; urgency=low
 
diff --git a/doc/examples/config.py b/doc/examples/config.py
index 222c1331..24d90a0d 100755
--- a/doc/examples/config.py
+++ b/doc/examples/config.py
@@ -42,8 +42,7 @@ if Cnf.FindB("version",0) == 1:
    print "Version selected - 1.1";
 
 if Cnf.FindB("help",0) == 1:
-   print apt_pkg.Package,apt_pkg.Version,"for",apt_pkg.Architecture, \
-         "compiled on",apt_pkg.Date,apt_pkg.Time;
+   print "python-apt",apt_pkg.Version,"compiled on",apt_pkg.Date,apt_pkg.Time;
    print "Hi, I am the help text for this program";
    sys.exit(0);
 
diff --git a/python/cache.cc b/python/cache.cc
index 36e49710..66a2c5d9 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -928,6 +928,11 @@ PyObject *TmpGetCache(PyObject *Self,PyObject *Args)
    if (PyArg_ParseTuple(Args, "|O", &pyCallbackInst) == 0)
       return 0;
 
+    if (_system == 0) {
+        PyErr_SetString(PyExc_ValueError,"_system not initialized");
+        return 0;
+    }
+
    pkgCacheFile *Cache = new pkgCacheFile();
 
    if(pyCallbackInst != 0) {