launchpad-reviewers team mailing list archive

Thread
Date

[Merge] lp:~wgrant/launchpad/uhoh-absolute into lp:launchpad

To: mp+242156@xxxxxxxxxxxxxxxxxx
From: William Grant <me@xxxxxxxxxxxxxxxxxx>
Date: Wed, 19 Nov 2014 00:25:35 -0000
Reply-to: mp+242156@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

William Grant has proposed merging lp:~wgrant/launchpad/uhoh-absolute into lp:launchpad.

Commit message:
Fix the "Uh oh!" pages to use absolute resource URLs so they work on any vhost, and fix the DSSPR -> DSPR compat redirect to not OOPS on invalid versions.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/uhoh-absolute/+merge/242156

Fix the "Uh oh!" pages to use absolute resource URLs so they work on any vhost, and fix the DSSPR -> DSPR compat redirect to not OOPS on invalid versions.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/uhoh-absolute into lp:launchpad.

=== modified file 'lib/canonical/launchpad/offline-maintenance-haproxy.html'
--- lib/canonical/launchpad/offline-maintenance-haproxy.html	2014-11-15 01:31:09 +0000
+++ lib/canonical/launchpad/offline-maintenance-haproxy.html	2014-11-19 00:25:01 +0000
@@ -11,7 +11,7 @@
   <title>Launchpad is offline for maintenance</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -39,7 +39,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/canonical/launchpad/offline-maintenance.html'
--- lib/canonical/launchpad/offline-maintenance.html	2014-11-15 01:31:09 +0000
+++ lib/canonical/launchpad/offline-maintenance.html	2014-11-19 00:25:01 +0000
@@ -8,7 +8,7 @@
   <title>Launchpad is offline for maintenance</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -32,7 +32,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/canonical/launchpad/offline-staging-code-update.html'
--- lib/canonical/launchpad/offline-staging-code-update.html	2014-11-15 01:31:09 +0000
+++ lib/canonical/launchpad/offline-staging-code-update.html	2014-11-19 00:25:01 +0000
@@ -8,7 +8,7 @@
   <title>Launchpad staging is updating</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -35,7 +35,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/canonical/launchpad/offline-staging-db-update.html'
--- lib/canonical/launchpad/offline-staging-db-update.html	2014-11-15 01:31:09 +0000
+++ lib/canonical/launchpad/offline-staging-db-update.html	2014-11-19 00:25:01 +0000
@@ -8,7 +8,7 @@
   <title>Launchpad staging is updating</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -35,7 +35,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/canonical/launchpad/offline-unplanned-haproxy.html'
--- lib/canonical/launchpad/offline-unplanned-haproxy.html	2014-11-15 01:31:09 +0000
+++ lib/canonical/launchpad/offline-unplanned-haproxy.html	2014-11-19 00:25:01 +0000
@@ -11,7 +11,7 @@
   <title>Launchpad is temporarily unavailable</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -50,7 +50,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/canonical/launchpad/offline-unplanned.html'
--- lib/canonical/launchpad/offline-unplanned.html	2014-11-15 01:31:09 +0000
+++ lib/canonical/launchpad/offline-unplanned.html	2014-11-19 00:25:01 +0000
@@ -8,7 +8,7 @@
   <title>Launchpad is temporarily unavailable</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -43,7 +43,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/lp/app/templates/launchpad-databaseunavailable.pt'
--- lib/lp/app/templates/launchpad-databaseunavailable.pt	2014-11-15 01:31:09 +0000
+++ lib/lp/app/templates/launchpad-databaseunavailable.pt	2014-11-19 00:25:01 +0000
@@ -9,7 +9,7 @@
   <title>Launchpad is temporarily unavailable</title>
   <link
     type="text/css" rel="stylesheet" media="screen, print"
-    href="/+icing/basic-error.css" />
+    href="https://launchpad.net/+icing/basic-error.css"; />
 </head>
 <body>
   <div class="page-center-wrap">
@@ -45,7 +45,7 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="/@@/launchpad-logo-and-name-hierarchy.png"
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
             alt="Launchpad" />
           </a>
         </div>

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2014-11-09 22:38:24 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2014-11-19 00:25:01 +0000
@@ -195,6 +195,8 @@
         removed in Nov 2014.
         """
         dspr = self.context.distribution_sourcepackage.getVersion(name)
+        if dspr is None:
+            return None
         return self.redirectSubTree(canonical_url(dspr), status=301)

Follow ups

[Merge] lp:~wgrant/launchpad/uhoh-absolute into lp:launchpad
From: noreply, 2014-11-19
Re: [Merge] lp:~wgrant/launchpad/uhoh-absolute into lp:launchpad
From: William Grant, 2014-11-19