Merge branch 'master' of git+ssh://git.debian.org/git/debexpo/debexpo

debexpo/plugins/closedbugs.py

@@ -104,7 +104,7 @@ class ClosedBugsPlugin(BasePlugin):
                 name = data["raw"][bug]['package']
                 data["bugs"][name].append((bug, data["raw"][bug]["subject"], data["raw"][bug]["severity"]))
 
-                if not data["raw"][bug]['source'] == self.changes["Source"] or name == "wnpp":
+                if not (data["raw"][bug]['source'] == self.changes["Source"] or name == "wnpp"):
                     data["errors"].append('Bug #%s does not belong to this package' % bug)
                     severity = max(severity, constants.PLUGIN_SEVERITY_ERROR)
 

debexpo/plugins/distribution.py

+# -*- coding: utf-8 -*-
+#
+#   distribution.py — distribution check plugin
+#
+#   This file is part of debexpo - http://debexpo.workaround.org
+#
+#   Copyright © 2012 Nicolas Dandrimont <nicolas.dandrimont@crans.org>
+#
+#   Permission is hereby granted, free of charge, to any person
+#   obtaining a copy of this software and associated documentation
+#   files (the "Software"), to deal in the Software without
+#   restriction, including without limitation the rights to use,
+#   copy, modify, merge, publish, distribute, sublicense, and/or sell
+#   copies of the Software, and to permit persons to whom the
+#   Software is furnished to do so, subject to the following
+#   conditions:
+#
+#   The above copyright notice and this permission notice shall be
+#   included in all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#   OTHER DEALINGS IN THE SOFTWARE.
+
+"""
+Distribution checks.
+"""
+
+__author__ = 'Nicolas Dandrimont'
+__copyright__ = ', '.join([
+        'Copyright © 2012 Nicolas Dandrimont',
+        ])
+__license__ = 'MIT'
+
+import logging
+import os
+
+from debexpo.lib import constants
+from debexpo.plugins import BasePlugin
+
+class DistributionPlugin(BasePlugin):
+
+    def test_distribution(self):
+        """
+        Checks whether the package is for the UNRELEASED distribution
+        """
+
+        data = {
+            "is-unreleased": False,
+            }
+        distribution = self.changes["Distribution"]
+
+        if distribution.lower() == "unreleased":
+            data["is-unreleased"] = True
+            self.failed("Package uploaded for the unreleased distribution", data, constants.PLUGIN_SEVERITY_ERROR)
+
+
+plugin = DistributionPlugin

debexpo/public/debexpo.js

@@ -110,4 +110,19 @@ $(document).ready(function() {
                 }
     );
 
+    /* Mark stuff as clickable in CSS when they are */
+
+    $(".visibility").each(function () {
+        if($(this).siblings(".qa-content").size() > 0) {
+            $(this).css("cursor", "pointer");
+        };
+    });
+    $(".qa-header").each(function () {
+        if($(this).siblings(".qa-content").size() > 0) {
+            $(this).css("cursor", "pointer");
+        };
+    });
+    $(".qa-toggle-all").css("cursor", "pointer");
+    $(".qa-toggle-info").css("cursor", "pointer");
+
 });
\ No newline at end of file

debexpo/scripts/debexpo_importer.py

@@ -421,7 +421,8 @@ class Importer(object):
         allowed_distributions = ('oldstable', 'stable', 'unstable', 'experimental', 'stable-backports', 'oldstable-backports',
             'oldstable-backports-sloppy', 'oldstable-security', 'stable-security', 'testing-security', 'stable-proposed-updates',
             'testing-proposed-updates', 'sid', 'wheezy', 'squeeze', 'lenny', 'squeeze-backports', 'lenny-backports',
-            'lenny-security', 'lenny-backports-sloppy', 'lenny-volatile', 'squeeze-security', 'squeeze-updates', 'wheezy-security')
+            'lenny-security', 'lenny-backports-sloppy', 'lenny-volatile', 'squeeze-security', 'squeeze-updates', 'wheezy-security',
+            'unreleased')
         if distribution not in allowed_distributions:
             self._remove_changes()
             self._reject("You are not uploading to one of those Debian distributions: %s" %

debexpo/templates/index/intro-maintainers.mako

@@ -69,6 +69,8 @@ incoming = /upload
 method = http
 allow_unsigned_uploads = 0
 progress_indicator = 2
+# Allow uploads for UNRELEASED packages
+allowed_distributions = .*
 </pre>
 
         </td>
@@ -84,7 +86,8 @@ passive_ftp = 1
 incoming = /
 method = ftp
 allow_unsigned_uploads = 0
-
+# Allow uploads for UNRELEASED packages
+allowed_distributions = .*
 </pre>
         </td>
     </tr>

debexpo/templates/plugins/buildsystem/html.mako

 <div class="qa-header">
 Buildsystem: ${o.outcome}
 </div>
-<div class="qa-content">
 %if o.rich_data["build-system"] == "debhelper":
+<div class="qa-content">
 %if o.rich_data["compat-level"]:
 Debhelper compatibility level ${o.rich_data["compat-level"]}
 %else:
 No compatibility level set!
 %endif
+</div>
 %endif
-</div>
\ No newline at end of file

debexpo/templates/plugins/distribution/html.mako

+<div class="qa-header">
+${o.outcome}
+</div>

debexpo/templates/plugins/distribution/text.mako

+${o.outcome}

development.ini

@@ -70,7 +70,7 @@ debexpo.debian_specific = true
 debexpo.plugins.post_upload = getorigtarball notuploader
 
 # What qa plugins to run, in this order
-debexpo.plugins.qa = lintian native maintaineremail watchfile closedbugs controlfields diffclean buildsystem debianqa
+debexpo.plugins.qa = lintian native maintaineremail watchfile closedbugs controlfields diffclean buildsystem debianqa distribution
 
 # What plugins to run when the package is uploaded to Debian, in this order
 debexpo.plugins.post_upload_to_debian = removepackage