[Collab-qa-commits] r1927 - udd/udd

[Lucas Nussbaum]

Author: lucas
Date: 2011-03-26 07:47:27 +0000 (Sat, 26 Mar 2011)
New Revision: 1927

Modified:
   udd/udd/i18n_apps_gatherer.py
   udd/udd/packages_gatherer.py
   udd/udd/sources_gatherer.py
Log:
debian_bundle->debian

Modified: udd/udd/i18n_apps_gatherer.py
===================================================================
--- udd/udd/i18n_apps_gatherer.py	2011-03-26 07:46:43 UTC (rev 1926)
+++ udd/udd/i18n_apps_gatherer.py	2011-03-26 07:47:27 UTC (rev 1927)
@@ -9,7 +9,7 @@
 from aux import quote
 from gatherer import gatherer
 import re
-from debian_bundle import deb822
+from debian import deb822
 from os import stat
 from sys import stderr, exit
 from filecmp import cmp

Modified: udd/udd/packages_gatherer.py
===================================================================
--- udd/udd/packages_gatherer.py	2011-03-26 07:46:43 UTC (rev 1926)
+++ udd/udd/packages_gatherer.py	2011-03-26 07:47:27 UTC (rev 1927)
@@ -2,7 +2,7 @@
 # Last-Modified: <Sun Aug 17 12:24:40 2008>
 # This file is a part of the Ultimate Debian Database project
 
-import debian_bundle.deb822
+import debian.deb822
 import gzip
 import os
 import sys
@@ -91,7 +91,7 @@
     pkgs = []
 
     # The fields that are to be read. Other fields are ignored
-    for control in debian_bundle.deb822.Packages.iter_paragraphs(sequence):
+    for control in debian.deb822.Packages.iter_paragraphs(sequence):
       # Check whether packages with architectue 'all' have already been
       # imported
       t = control['Package'] + '_' + control['Version'] + '_' + control['Architecture']
@@ -185,7 +185,7 @@
 	    """ %  (table, self._distr, src_cfg['release'], comp))
 #	  aux.print_debug("Reading file " + path)
 	  # Copy content from gzipped file to temporary file, so that apt_pkg is
-	  # used by debian_bundle
+	  # used by debian
 	  tmp = tempfile.NamedTemporaryFile()
 	  file = gzip.open(path)
 	  tmp.write(file.read())

Modified: udd/udd/sources_gatherer.py
===================================================================
--- udd/udd/sources_gatherer.py	2011-03-26 07:46:43 UTC (rev 1926)
+++ udd/udd/sources_gatherer.py	2011-03-26 07:47:27 UTC (rev 1927)
@@ -2,7 +2,7 @@
 # Last-Modified: <Sun Aug 17 12:07:25 2008>
 # This file is a part of the Ultimate Debian Database project
 
-import debian_bundle.deb822
+import debian.deb822
 import gzip
 import os
 import sys
@@ -108,7 +108,7 @@
     query_uploaders = """EXECUTE uploader_insert (%(Package)s, %(Version)s,
       %(Uploader)s, %(Name)s, %(Email)s)"""
     uploaders = []
-    for control in debian_bundle.deb822.Packages.iter_paragraphs(file):
+    for control in debian.deb822.Packages.iter_paragraphs(file):
       d = self.build_dict(control)
       d['maintainer_name'], d['maintainer_email'] = email.Utils.parseaddr(d['Maintainer'])
       pkgs.append(d)
@@ -170,7 +170,7 @@
 
 #        aux.print_debug("Reading file " + path)
         # Copy content from gzipped file to temporary file, so that apt_pkg is
-        # used by debian_bundle
+        # used by debian
         tmp = tempfile.NamedTemporaryFile()
         file = gzip.open(path)
         tmp.write(file.read())