From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 22 Jan 2012 15:32:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'ansgar/description-md5' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b5a756d8ad61414c90ad4c0bd80f98f27c9f8659;hp=f8f0c97694e006b9ecf819bc0a6b6c112c617089;p=dak.git

Merge remote-tracking branch 'ansgar/description-md5' into merge

* ansgar/description-md5:
  Add a missing import.
  Remove --description-md5 option.
  Disable generation of newdists.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index b9f834b3..ebd2b692 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -154,8 +154,6 @@ function packages() {
     log "Generating Packages and Sources files"
     #cd $configdir
     #dak generate-packages-sources
-    # XXX: disable again later
-    dak generate-packages-sources2 --description-md5 -o Dir::Root=$webdir/newdists/
     dak generate-packages-sources2
     dak contents generate
 }
@@ -169,11 +167,8 @@ function release() {
     # XXX: disable once we can remove i18n/Index (#649314)
     log "Generating i18n/Index"
     (cd "$ftpdir/dists"; for dist in testing unstable; do $scriptsdir/generate-i18n-Index $dist; done)
-    (cd "$webdir/newdists/dists"; for dist in testing unstable; do $scriptsdir/generate-i18n-Index $dist; done)
     log "Generating Release files"
     dak generate-releases
-    # XXX: disable again later
-    dak generate-releases -o Dir::Root=$webdir/newdists/
 }
 
 function dakcleanup() {
diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 8290cca3..e746019d 100755
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -38,11 +38,6 @@ Generate the Packages/Sources files
                                Default: All suites not marked 'untouchable'
   -f, --force                  Allow processing of untouchable suites
                                CAREFUL: Only to be used at point release time!
-  -5, --description-md5        Allow to use Description-md5 instead of
-                               Description for Packages index and generate
-                               Translation-en
-                               NOTE: suite.include_long_descriptions needs to
-                               be set to false for this.
   -h, --help                   show this help and exit
 
 SUITE can be a space seperated list, e.g.
@@ -206,7 +201,7 @@ WHERE
 ORDER BY tmp.source, tmp.package, tmp.version
 """
 
-def generate_packages(suite_id, component_id, architecture_id, type_name, use_description_md5):
+def generate_packages(suite_id, component_id, architecture_id, type_name):
     global _packages_query
     from daklib.filewriter import PackagesFileWriter
     from daklib.dbconn import Architecture, Component, DBConn, OverrideType, Suite
@@ -221,7 +216,7 @@ def generate_packages(suite_id, component_id, architecture_id, type_name, use_de
     architecture = session.query(Architecture).get(architecture_id)
 
     overridesuite_id = suite.get_overridesuite().suite_id
-    include_long_description = suite.include_long_description or not use_description_md5
+    include_long_description = suite.include_long_description
 
     # We currently filter out the "Tag" line. They are set by external
     # overrides and NOT by the maintainer. And actually having it set by
@@ -314,7 +309,6 @@ def main():
     cnf = Config()
 
     Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"),
-                 ('5','description-md5',"Generate-Packages-Sources::Options::Description-md5"),
                  ('s',"suite","Generate-Packages-Sources::Options::Suite"),
                  ('f',"force","Generate-Packages-Sources::Options::Force"),
                  ('o','option','','ArbItem')]
@@ -350,7 +344,6 @@ def main():
     else:
         suites = session.query(Suite).filter(Suite.untouchable == False).all()
 
-    use_description_md5 = Options.has_key("Description-md5") and Options["Description-md5"]
     force = Options.has_key("Force") and Options["Force"]
 
     component_ids = [ c.component_id for c in session.query(Component).all() ]
@@ -367,16 +360,17 @@ def main():
 
     for s in suites:
         if s.untouchable and not force:
+            import utils
             utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
         for c in component_ids:
             pool.apply_async(generate_sources, [s.suite_id, c], callback=parse_results)
-            if use_description_md5 and not s.include_long_description:
+            if not s.include_long_description:
                 pool.apply_async(generate_translations, [s.suite_id, c], callback=parse_results)
             for a in s.architectures:
                 if a == 'source':
                     continue
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb', use_description_md5], callback=parse_results)
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb', use_description_md5], callback=parse_results)
+                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=parse_results)
+                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=parse_results)
 
     pool.close()
     pool.join()