From: Torsten Werner Date: Mon, 2 Nov 2009 21:50:05 +0000 (+0100) Subject: Merge branch 'master' into msfl X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fb61d19d0155cadc9d085f2580db548208bb5018;hp=03899d74760423ca4cbb44ab04329a33182fb316;p=dak.git Merge branch 'master' into msfl --- diff --git a/config/debian/lintian.tags b/config/debian/lintian.tags index a2fa607d..6a11a9ec 100644 --- a/config/debian/lintian.tags +++ b/config/debian/lintian.tags @@ -11,11 +11,26 @@ lintian: - usr-share-doc-symlink-without-dependency - mknod-in-maintainer-script - package-contains-info-dir-file - - copyright-lists-upstream-authors-with-dh_make-boilerplate + - binary-or-shlib-defines-rpath + - non-etc-file-marked-as-conffile + - embedded-zlib + - no-shlibs-control-file + - copyright-contains-dh_make-todo-boilerplate + - preinst-interpreter-without-predepends + - control-interpreter-without-depends fatal: + - debian-control-file-uses-obsolete-national-encoding + - malformed-deb-archive + - bad-package-name + - no-architecture-field + - package-contains-ancient-file + - forbidden-postrm-interpreter + - control-interpreter-in-usr-local + - package-uses-local-diversion - wrong-file-owner-uid-or-gid - bad-relation - FSSTND-dir-in-usr + - FSSTND-dir-in-var - binary-in-etc - missing-dependency-on-perlapi - section-is-dh_make-template diff --git a/dak/dakdb/update23.py b/dak/dakdb/update23.py old mode 100644 new mode 100755 index 8cc7ec4a..48abf016 --- a/dak/dakdb/update23.py +++ b/dak/dakdb/update23.py @@ -54,9 +54,9 @@ CREATE VIEW srcfiles_suite_component AS JOIN location ON files.location = location.id; """) - print "Committing" - c.execute("UPDATE config SET value = '23' WHERE name = 'db_revision'") - self.db.commit() + print "Committing" + c.execute("UPDATE config SET value = '23' WHERE name = 'db_revision'") + self.db.commit() except psycopg2.InternalError, msg: self.db.rollback()