* utils/migrate-0.8.py:

  - Improve C++ parsing and add apt.progress.old to the modules, reduces
    false positives.

2 files changed, 8 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index d981c8b5..b09fb684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ python-apt (0.7.93.2) UNRELEASED; urgency=low
     - apt/utils.py: Completely ported, previous one was old-API from Ubuntu.
     - apt/cache.py: Use the new progress classes instead of the old ones.
     - apt/package.py: Various smaller issues fixed, probably caused by merge.
+  * utils/migrate-0.8.py:
+    - Improve C++ parsing and add apt.progress.old to the modules, reduces
+      false positives.
 
  -- Julian Andres Klode <jak@debian.org>  Sun, 07 Feb 2010 19:58:40 +0100
 
diff --git a/utils/migrate-0.8.py b/utils/migrate-0.8.py
index dc919e1d..61059b2a 100755
--- a/utils/migrate-0.8.py
+++ b/utils/migrate-0.8.py
@@ -82,8 +82,10 @@ def find_deprecated_cpp():
                 break
 
             while lines and not ';' in line:
-                while lines and not 'COMPAT_0_7' in line:
+                while lines and not 'COMPAT_0_7' in line and not ';' in line:
                     line = lines.pop(0)
+                if ';' in line:
+                    continue
                 if lines:
                     line = lines.pop(0)
                 while lines and not '#endif' in line:
@@ -122,8 +124,8 @@ def find_deprecated_py():
     """
 
     modules = ('apt', 'apt.package', 'apt.cdrom', 'apt.cache', 'apt.debfile',
-               'apt.progress', 'aptsources.distinfo', 'aptsources.distro',
-               'aptsources.sourceslist')
+               'apt.progress', 'apt.progress.old', 'aptsources.distinfo',
+               'aptsources.distro', 'aptsources.sourceslist')
 
     import apt_pkg
     apt_pkg._COMPAT_0_7 = 0