Merge branch 'master' of git://git.debian.org/git/users/otavio/dak into small_fixes

* 'master' of git://git.debian.org/git/users/otavio/dak:
  docs/manpages/clean-suites.1.sgml: Minor typo fix
  dak/import_archive.py: Add support to udeb packages
  dak/control_suite.py (main): Handle SystemError exception in case of a incompatible commandline parameter
  dak/check_overrides.py (main): Use case-insensitive comparing for codename

diff --git a/ChangeLog b/ChangeLog
index 2193924442f4ac02ca612e5d28d305eb0efe572b..680621d21a282dc73323bc05c91aac35fbfa34aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-14  Otavio Salvador  <otavio@debian.org>
+
+       * docs/manpages/clean-suites.1.sgml: Minor typo fix
+
+       * dak/import_archive.py: Add support to udeb packages
+
+       * dak/control_suite.py (main): Handle SystemError exception in
+       case of a incompatible commandline parameter
+
+       * dak/check_overrides.py (main): Use case-insensitive comparing
+       for codename
+
 2008-06-14  Joerg Jaspert  <joerg@debian.org>
 
        * scripts/debian/byhand-task: Merged patch from Frans Pop to

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 2a576b58ad1c77ba7e19b4032ba7831bc504bc79..f276dbae304e356443fd430b03b2d0f2daedd2a1 100644 (file)
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -314,10 +314,10 @@ def main ():
 
         print "Processing %s%s..." % (osuite, originremark)
         # Get a list of all suites that use the override file of 'osuite'
-        ocodename = Cnf["Suite::%s::codename" % osuite]
+        ocodename = Cnf["Suite::%s::codename" % osuite].lower()
         suites = []
         for suite in Cnf.SubTree("Suite").List():
-            if ocodename == Cnf["Suite::%s::OverrideCodeName" % suite]:
+            if ocodename == Cnf["Suite::%s::OverrideCodeName" % suite].lower():
                 suites.append(suite)
 
         q = projectB.query("SELECT id FROM suite WHERE suite_name in (%s)" \

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 4cb5bd3805e3c4fa0b03efe7ce8e308247f80f89..4b704b97b9aaf133b18e5894013e2d2cb1ddb728 100644 (file)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -244,7 +244,11 @@ def main ():
         if not Cnf.has_key("Control-Suite::Options::%s" % (i)):
             Cnf["Control-Suite::Options::%s" % (i)] = ""
 
-    file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+    try:
+        file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
+    except SystemError, e:
+        print "%s\n" % e
+        usage(1)
     Options = Cnf.SubTree("Control-Suite::Options")
 
     if Options["Help"]:

diff --git a/dak/import_archive.py b/dak/import_archive.py
index 203221bee9d01a92e8c50d5c9219511765b3e8ac..4432ff1ac602c6b8008a2efcff154cbd9e9a3d23 100755 (executable)
--- a/dak/import_archive.py
+++ b/dak/import_archive.py
@@ -433,8 +433,12 @@ def process_packages (filename, suite, component, archive):
         if not source_version:
             source_version = version
         filename = Scanner.Section["filename"]
+        if filename.endswith(".deb"):
+            type = "deb"
+        else:
+            type = "udeb"
         location = get_location_path(filename.split('/')[0])
-        location_id = database.get_location_id (location, component, archive)
+        location_id = database.get_location_id (location, component.replace("/debian-installer", ""), archive)
         filename = poolify (filename, location)
         if architecture == "all":
             filename = re_arch_from_filename.sub("binary-all", filename)
@@ -443,7 +447,6 @@ def process_packages (filename, suite, component, archive):
         size = Scanner.Section["size"]
         md5sum = Scanner.Section["md5sum"]
         files_id = get_or_set_files_id (filename, size, md5sum, location_id)
-        type = "deb"; # FIXME
         cache_key = "%s_%s_%s_%d_%d_%d_%d" % (package, version, repr(source_id), architecture_id, location_id, files_id, suite_id)
         if not arch_all_cache.has_key(cache_key):
             arch_all_cache[cache_key] = 1
@@ -566,7 +569,9 @@ Please read the documentation before running this script.
             process_packages (packages, suite, "", server)
         elif type == "legacy" or type == "pool":
             for suite in Cnf.ValueList("Location::%s::Suites" % (location)):
-                for component in Cnf.SubTree("Component").List():
+                udeb_components = map(lambda x: x+"/debian-installer",
+                                      Cnf.ValueList("Suite::%s::UdebComponents" % suite))
+                for component in Cnf.SubTree("Component").List() + udeb_components:
                     architectures = filter(utils.real_arch,
                                            Cnf.ValueList("Suite::%s::Architectures" % (suite)))
                     for architecture in architectures:

diff --git a/docs/manpages/clean-suites.1.sgml b/docs/manpages/clean-suites.1.sgml
index 0691f5acdf601bdbb85acd1f4fa29b04e7f2141f..621bbc3476fb7af7b32feb2ad6eb83753fc1ca16 100644 (file)
--- a/docs/manpages/clean-suites.1.sgml
+++ b/docs/manpages/clean-suites.1.sgml
@@ -30,7 +30,7 @@
 
   <RefSect1><Title>Description</>
     <para>
-      <command>dak clean-suites</command> is a utility clean out old packages. It will clean out any binary packages not referenced by a suite and any source packages not referenced by a suite and not referenced by any binary packages.  Cleaning is not actual deletion, but rather, removal of packages from the pool to a 'morgue' directory.  The 'morgue' directory is split into dated sub-directories to keep things sane in big archives.
+      <command>dak clean-suites</command> is a utility to clean out old packages. It will clean out any binary packages not referenced by a suite and any source packages not referenced by a suite and not referenced by any binary packages.  Cleaning is not actual deletion, but rather, removal of packages from the pool to a 'morgue' directory.  The 'morgue' directory is split into dated sub-directories to keep things sane in big archives.
     </PARA>
   </REFSECT1>