First implementation of make-changelog command

Signed-off-by: NLuca Falavigna <dktrkranz@debian.org>

dak/dak.py

@@ -144,6 +144,8 @@ def init():
          "import old changes files into known_changes table"),
         ("add-user",
          "Add a user to the archive"),
+        ("make-changelog",
+         "Generate changelog between two suites"),
         ]
     return functionality
 

dak/dakdb/update33.py

+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Implement changelogs table
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2010 Luca Falavigna <dktrkranz@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+
+################################################################################
+def do_update(self):
+    """
+    Implement changelogs table
+    """
+    print __doc__
+    try:
+        c = self.db.cursor()
+        c.execute('CREATE TABLE changelogs (source text, version debversion, suite text, changelog text)')
+        c.execute("GRANT SELECT ON changelogs TO public")
+        c.execute("GRANT ALL ON changelogs TO ftpmaster")
+        c.execute("UPDATE config SET value = '33' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError, msg:
+        self.db.rollback()
+        raise DBUpdateError, 'Unable to apply build_queue update 32, rollback issued. Error message : %s' % (str(msg))

dak/make_changelog.py

+#!/usr/bin/env python
+
+"""
+Generate changelog entry between two suites
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2010 Luca Falavigna <dktrkranz@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+# <bdefreese> !dinstall
+# <dak> bdefreese: I guess the next dinstall will be in 0hr 1min 35sec
+# <bdefreese> Wow I have great timing
+# <DktrKranz> dating with dinstall, part II
+# <bdefreese> heh
+# <Ganneff> dating with that monster? do you have good combat armor?
+# <bdefreese> +5 Plate :)
+# <Ganneff> not a good one then
+# <Ganneff> so you wont even manage to bypass the lesser monster in front, unchecked
+# <DktrKranz> asbesto belt
+# <Ganneff> helps only a step
+# <DktrKranz> the Ultimate Weapon: cron_turned_off
+# <bdefreese> heh
+# <Ganneff> thats debadmin limited
+# <Ganneff> no option for you
+# <DktrKranz> bdefreese: it seems ftp-masters want dinstall to sexual harass us, are you good in running?
+# <Ganneff> you can run but you can not hide
+# <bdefreese> No, I'm old and fat :)
+# <Ganneff> you can roll but you can not hide
+# <Ganneff> :)
+# <bdefreese> haha
+# <DktrKranz> damn dinstall, you racist bastard
+
+################################################################################
+
+import sys
+import apt_pkg
+from daklib.dbconn import *
+from daklib import utils
+from daklib.queue import Upload
+
+################################################################################
+
+suites = {'proposed-updates': 'proposedupdates',
+          'oldstable-proposed-updates': 'oldproposedupdates'}
+
+def usage (exit_code=0):
+    print """Usage: make-changelog -s <suite> -b <base_suite> [OPTION]...
+Generate changelog between two suites
+
+Options:
+
+  -h, --help                show this help and exit
+  -s, --suite               suite providing packages to compare
+  -b, --base-suite          suite to be taken as reference for comparison"""
+
+    sys.exit(exit_code)
+
+def get_new_packages(suite, base_suite):
+    """
+    Returns a dict of sources and versions where version is newer in base.
+    """
+
+    suite_sources = dict()
+    base_suite_sources = dict()
+    new_in_suite = dict()
+    session = DBConn().session()
+
+    # Get source details from given suites
+    for i in get_all_sources_in_suite(suite, session):
+        suite_sources[i[0]] = i[1]
+    for i in get_all_sources_in_suite(base_suite, session):
+        base_suite_sources[i[0]] = i[1]
+
+    # Compare if version in suite is greater than the base_suite one
+    for i in suite_sources.keys():
+        if i not in suite_sources.keys():
+            new_in_suite[i] = (suite_sources[i], 0)
+        elif apt_pkg.VersionCompare(suite_sources[i], base_suite_sources[i]) > 0:
+            new_in_suite[i] = (suite_sources[i], base_suite_sources[i])
+
+    return new_in_suite
+
+def generate_changelog(suite, source, versions):
+    """
+    Generates changelog data returned from changelogs table
+    """
+    query = """
+    SELECT changelog FROM changelogs
+    WHERE suite = :suite
+    AND source = :source
+    AND version > :base
+    AND version <= :current
+    ORDER BY source, version DESC"""
+    session = DBConn().session()
+
+    result = session.execute(query, {'suite': suites[suite], 'source': source, \
+                             'base': versions[1], 'current': versions[0]})
+    session.commit()
+    for r in result.fetchall():
+        for i in range(0, len(r)):
+            print r[i]
+
+def main():
+    Cnf = utils.get_conf()
+    Arguments = [('h','help','Make-Changelog::Options::Help'),
+                 ('s','suite','Make-Changelog::Options::Suite', 'HasArg'),
+                 ('b','base-suite','Make-Changelog::Options::Base-Suite', 'HasArg')]
+
+    for i in ['help', 'suite', 'base-suite']:
+        if not Cnf.has_key('Make-Changelog::Options::%s' % (i)):
+            Cnf['Make-Changelog::Options::%s' % (i)] = ''
+
+    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
+    Options = Cnf.SubTree('Make-Changelog::Options')
+    suite = Cnf['Make-Changelog::Options::Suite']
+    base_suite = Cnf['Make-Changelog::Options::Base-Suite']
+
+    if Options['help'] or not (suite and base_suite):
+        usage()
+
+    for s in suite, base_suite:
+        if not get_suite(s):
+            utils.fubar('Invalid suite "%s"' % s)
+
+    new_packages = get_new_packages(suite, base_suite)
+    for package in sorted(new_packages.keys()):
+        generate_changelog(suite, package, new_packages[package])
+
+if __name__ == '__main__':
+    main()

dak/process_policy.py

@@ -65,6 +65,9 @@ def do_comments(dir, srcqueue, opref, npref, line, fn, session):
                 continue
             fn(f, srcqueue, "".join(lines[1:]), session)
 
+        if len(changes_files) and not Options["No-Action"]:
+            store_changelog(changes_files[0], srcqueue)
+
         if opref != npref and not Options["No-Action"]:
             newcomm = npref + comm[len(opref):]
             os.rename("%s/%s" % (dir, comm), "%s/%s" % (dir, newcomm))
@@ -113,6 +116,21 @@ def comment_reject(changes_file, srcqueue, comments, session):
 
 ################################################################################
 
+def store_changelog(changes_file, srcqueue):
+    Cnf = Config()
+    u = Upload()
+    u.pkg.changes_file = os.path.join(Cnf['Dir::Queue::Newstage'], changes_file)
+    u.load_changes(u.pkg.changes_file)
+    u.update_subst()
+    query = """INSERT INTO changelogs (source, version, suite, changelog)
+               VALUES (:source, :version, :suite, :changelog)"""
+    session = DBConn().session()
+    session.execute(query, {'source': u.pkg.changes['source'], 'version': u.pkg.changes['version'], \
+                    'suite': srcqueue.queue_name, 'changelog': u.pkg.changes['changes']})
+    session.commit()
+
+################################################################################
+
 def main():
     global Options, Logger
 

dak/update_db.py

@@ -45,7 +45,7 @@ from daklib.dak_exceptions import DBUpdateError
 ################################################################################
 
 Cnf = None
-required_database_schema = 32
+required_database_schema = 33
 
 ################################################################################
 

daklib/dbconn.py

@@ -2212,6 +2212,30 @@ def get_source_in_suite(source, suite, session=None):
 
 __all__.append('get_source_in_suite')
 
+@session_wrapper
+def get_all_sources_in_suite(suitename, session=None):
+    """
+    Returns list of sources and versions found in a given suite
+
+      - B{suite} - a suite name, eg. I{unstable}
+
+    @type suite: string
+    @param suite: the suite name
+
+    @rtype: dictionary
+    @return: the version for I{source} in I{suite}
+
+    """
+    query = """SELECT source, version FROM source_suite
+    WHERE suite_name=:suitename
+    ORDER BY source"""
+
+    vals = {'suitename': suitename}
+   
+    return session.execute(query, vals)
+
+__all__.append('get_all_sources_in_suite')
+
 ################################################################################
 
 @session_wrapper