From: Mike O'Connor <stew@vireo.org>
Date: Sat, 9 Jan 2010 19:14:39 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into contents
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9c66ac39be80ceb4fdcc58823852df090c10a029;hp=48a09717fc5fbf01c58b7e0379648e6b666c861a;p=dak.git

Merge remote branch 'origin/master' into contents

* origin/master:
  fix function prod_maintainer()
  website
  process-upload
  process-upload
---

diff --git a/dak/process_new.py b/dak/process_new.py
index b8550fd1..74bae8fe 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -448,14 +448,13 @@ def add_overrides (new, upload, session):
 
 ################################################################################
 
-def prod_maintainer (note, upload):
+def prod_maintainer (notes, upload):
     cnf = Config()
     # Here we prepare an editor and get them ready to prod...
     (fd, temp_filename) = utils.temp_filename()
     temp_file = os.fdopen(fd, 'w')
-    if len(note) > 0:
-        for line in note:
-            temp_file.write(line)
+    for note in notes:
+        temp_file.write(note.comment)
     temp_file.close()
     editor = os.environ.get("EDITOR","vi")
     answer = 'E'
diff --git a/dak/process_upload.py b/dak/process_upload.py
index 0f50137c..13474071 100755
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -394,8 +394,9 @@ def process_it(changes_file, session):
             valid_dsc_p = u.check_dsc(not Options["No-Action"])
             if valid_dsc_p and not Options["No-Action"]:
                 u.check_source()
-                u.check_lintian()
             u.check_hashes()
+            if valid_dsc_p and not Options["No-Action"] and not len(u.rejects):
+                u.check_lintian()
             u.check_urgency()
             u.check_timestamps()
             u.check_signed_by_key()
diff --git a/web/index.html b/web/index.html
index 5c257e61..32f2f82f 100644
--- a/web/index.html
+++ b/web/index.html
@@ -45,6 +45,7 @@
 			<li><a href="#testing">Testing</a></li>
 			<li><a href="#stable">Stable</a></li>
 			<li><a href="#rejections">Rejections</a></li>
+			<li><a href="#lintianrejects">Lintian Autorejects</a></li>
 <!--			<li><a href="#dependencies">Unmet Dependencies</a></li>-->
 			<li><a href="#archivecriteria">Archive Criteria</a></li>
 			<li><a href="#talks">Talks</a></li>
@@ -194,10 +195,40 @@
             <a href="http://ftp-master.debian.org/REJECT-FAQ.html">the REJECT-FAQ</a>.</p>
         </div>
 
+		<div id="lintianrejects">
+		  <h1>Lintian Autorejects</h1>
+		  <p>Packages failing a defined set of lintian tags will no
+		  longer be accepted into the archive, but get rejected immediately.</p>
+
+		  <p>Those automated rejects will only be done on sourceful uploads to
+		  unstable and experimental.</p>
+
+		  <p>As there are certain lintian tags that should only appear in very rare
+		  cases we have created two categories:
+		  <dl>
+			<dt>warning</dt>
+			<dd>Tags listed here *can* be overriden by the maintainer using the normal
+			  lintian override mechanism. Of course this should only be done if you
+			  have a technically sound reason why your package needs to break in such a
+			  way.
+			</dd>
+			<dt>error</dt>
+            <dd>Tags listed here can not be overridden. Those are tags
+               corresponding to packaging errors serious enough to mark a
+               package unfit for the archive and should never happen. In
+               fact, most of the tags listed do not appear in our archive
+               currently, the few packages listed below should be easily
+               fixable with their next upload.
+            </dd>
+          </dl>
+          </p>
+          <p>The current list of tags can be <a href="static/lintian.tags">found here</a>.
+        </div>
+
 <!--         <div id="dependencies"> -->
 <!--             <h1>Unmet/Illegal dependencies</h1> -->
 
-<!-- 		    <p> -->
+<!--             <p> -->
 <!--             <a href="/unmet-deps/">Reports</a> of unmet and/or illegal dependencies -->
 <!--             for most architectures in testing+unstable used to be generated daily.</p> -->
 <!--             <p>If your package(s) are listed, you're likely to be violating policy... -->
@@ -217,7 +248,7 @@
             <a href="ftpmaster.pdf">DebConf 2009</a>, Cáceres, Spain.
         </div>
 
-		</div>
+        </div>
         </div>
         </div>
     <hr />
diff --git a/web/removals-style.css b/web/removals-style.css
index 8ad2aa15..6c21fa67 100644
--- a/web/removals-style.css
+++ b/web/removals-style.css
@@ -1,6 +1,10 @@
 body {
 	font-family: sans-serif;
 }
+dt {
+ font-family: Arial, Helvetica, sans-serif;
+ font-weight: bold;
+}
 a img {
 	text-decoration: none;
 	border: none;