]> git.donarmstrong.com Git - dak.git/commitdiff
Merge remote branch 'drkranz/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Tue, 24 Aug 2010 20:38:59 +0000 (22:38 +0200)
committerJoerg Jaspert <joerg@debian.org>
Tue, 24 Aug 2010 20:38:59 +0000 (22:38 +0200)
* drkranz/master:
  queue_report.py: toggle headers too
  queue_report.py: toggle binary-NEW packages only
  lintian.tags: remove some duplicated tags

Signed-off-by: Joerg Jaspert <joerg@debian.org>
config/debian/lintian.tags
dak/queue_report.py

index 2702e48ad4919dec796ae66701f8216d020d1cef..c8e668a2bc5e4a6f8be41a2548f26b009aaca846 100644 (file)
@@ -4,11 +4,9 @@ lintian:
     - arch-independent-package-contains-binary-or-object
     - arch-dependent-file-in-usr-share
     - missing-build-dependency
-    - arch-dependent-file-in-usr-share
     - missing-dependency-on-libc
     - usr-share-doc-symlink-without-dependency
     - binary-with-bad-dynamic-table
-    - usr-share-doc-symlink-without-dependency
     - mknod-in-maintainer-script
     - package-contains-info-dir-file
     - binary-or-shlib-defines-rpath
@@ -57,11 +55,9 @@ lintian:
     - description-is-dh_make-template
     - file-in-etc-not-marked-as-conffile
     - no-package-name
-    - bad-package-name
     - package-not-lowercase
     - no-version-field
     - bad-version-number
-    - no-architecture-field
     - magic-arch-in-arch-list
     - too-many-architectures
     - no-maintainer-field
index be4787219e9fde8a5963fa3fb665637c90a0fd86..84f6a22f23946139349199b27afa46f3597a7f52 100755 (executable)
@@ -40,7 +40,7 @@ import apt_pkg
 
 from daklib import utils
 from daklib.queue import Upload
-from daklib.dbconn import DBConn, has_new_comment, DBChange, get_uid_from_fingerprint
+from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, get_uid_from_fingerprint
 from daklib.textutils import fix_maintainer
 from daklib.dak_exceptions import *
 
@@ -172,6 +172,23 @@ def header():
     <title>
       Debian NEW and BYHAND Packages
     </title>
+    <script type="text/javascript">
+    function togglePkg() {
+        var children = document.getElementsByTagName("*");
+        for (var i = 0; i < children.length; i++) {
+            if(!children[i].hasAttribute("class"))
+                continue;
+            c = children[i].getAttribute("class").split(" ");
+            for(var j = 0; j < c.length; j++) {
+                if(c[j] == "binNEW") {
+                    if (children[i].style.display == '')
+                        children[i].style.display = 'none';
+                    else children[i].style.display = '';
+                }
+            }
+        }
+    }
+    </script>
   </head>
   <body id="NEW">
     <div id="logo">
@@ -219,10 +236,12 @@ def footer():
     """
 
 def table_header(type, source_count, total_count):
-    print "<h1>Summary for: %s</h1>" % (type)
+    print "<h1 class='binNEW'>Summary for: %s</h1>" % (type)
+    print "<h1 class='binNEW' style='display: none'>Summary for: binary-%s only</h1>" % (type)
     print """
     <table class="NEW">
-      <caption>
+      <p class="togglepkg" onclick="togglePkg()">Click to toggle all/binary-NEW packages</p>
+      <caption class="binNEW">
     """
     print "Package count in <strong>%s</strong>: <em>%s</em>&nbsp;|&nbsp; Total Package count: <em>%s</em>" % (type, source_count, total_count)
     print """
@@ -250,10 +269,15 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     global row_number
 
     trclass = "sid"
+    session = DBConn().session()
     for dist in distribution:
         if dist == "experimental":
             trclass = "exp"
 
+    if not len(session.query(DBSource).filter_by(source = source).all()):
+        trclass += " binNEW"
+    session.commit()
+
     if row_number % 2 != 0:
         print "<tr class=\"%s even\">" % (trclass)
     else: