[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#703938: udd: please ignore no bug, patch and version difference with Ubuntu



Quoting Lucas Nussbaum (2013-03-29 08:27:36)
> Hi,
> 
> It's actually quite easy to test, see http://udd.debian.org/hacking.html
Thanks for that, actual testing helps a lot :-)

> I don't think your patch addresses "ignore same version in sid and ubuntu devel
> release"?
Indeed, it didn't and had other problems. Here's a fixed version.

Cheers,
Simon
From e44fa68c777c0372bf901b84e74e3865f2884a82 Mon Sep 17 00:00:00 2001
From: Simon Chopin <chopin.simon@gmail.com>
Date: Tue, 26 Mar 2013 19:29:50 +0100
Subject: [PATCH] Don't show packages without diff, patch nor bug in the
 Ubuntu tab.

Thanks to Ideki Yamane for the idea.
---
 web/dmd.cgi |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/dmd.cgi b/web/dmd.cgi
index bd819f4..36648ee 100755
--- a/web/dmd.cgi
+++ b/web/dmd.cgi
@@ -324,7 +324,6 @@ if cgi.params != {}
   $uddd.sources.keys.sort.each do |src|
     next if not $uddd.versions.include?(src)
     next if (not $uddd.versions[src].include?('debian') or not $uddd.versions[src].include?('ubuntu'))
-    puts "<tr><td class=\"left\">#{src_reason(src)}&nbsp;</td>"
 
     ub = $uddd.ubuntu_bugs[src]
     if ub.nil?
@@ -353,7 +352,11 @@ if cgi.params != {}
       ustb += "<br>bpo:&nbsp;#{du["#{USTB}-backports"][:version]}" if du["#{USTB}-backports"]
 
       udev = du[UDEV][:version] if du[UDEV]
-      if udev != sid and sid != ''
+      if udev == sid
+        if bugs == 0 and patches == 0
+          next
+        end
+      elsif sid != ''
         if UDDData.compare_versions(udev, sid) == -1
           if udev =~ /ubuntu/
             udev = "<a href=\"http://ubuntudiff.debian.net/?query=-FPackage+#{src}\";><span class=\"prio_high\" title=\"Outdated version in Ubuntu, with an Ubuntu patch\">#{udev}</span></a>"
@@ -373,6 +376,7 @@ if cgi.params != {}
       udev += "<br>bpo:&nbsp;#{du["#{UDEV}-backports"][:version]}" if du["#{UDEV}-backports"]
     end
 
+    puts "<tr><td class=\"left\">#{src_reason(src)}&nbsp;</td>"
     if bugs > 0
       puts "<td><a href=\"https://bugs.launchpad.net/ubuntu/+source/#{src}\";>#{bugs}</a></td>"
     else
-- 
1.7.10.4


Reply to: