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

Bug#703237: packages.debian.org: Inverted 'experimental' and 'rc-buggy'.



Package: www.debian.org
Severity: minor

Hello everybody,

I just realised that packages.debian.org inverts 'experimental' and 'rc-buggy'.

Its list of suites is 'stable', 'testing', 'unstable' and 'rc-buggy', and its
list of aliases is 'squeeze', 'wheezy', 'sid', and 'experimental', while
'rc-buggy' is the Toy Story name and 'experimental' is the plain English name.

I think that it creates confusion in the search page as in the
following example.

    Package euca2ools

     * squeeze (stable) (utils): managing cloud instances for Eucalyptus 
       1.2-1: all

     * wheezy (testing) (utils): managing cloud instances for Eucalyptus 
       2.0.2-1: all

     * sid (unstable) (utils): managing cloud instances for Eucalyptus 
       2.0.2-1: all

     * experimental (rc-buggy) (utils): managing cloud instances for Eucalyptus 
       2.1.3-1~experimental1: all

The inversion makes it more difficult to understand that 'rc-buggy' is a code
name, and suggests that the package has RC bugs, which is not the case.

I looked at the code of p.d.o, and wonder if the attached patch would mitigate
the problem by inverting 'experimental' and 'rc-buggy'.

Have a nice day,

-- 
Charles Plessy
Tsurumi, Kangawa, Japan
>From ec6a49249b2d3e39af5fee41d5c2f3be316347db Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Sun, 17 Mar 2013 21:37:44 +0900
Subject: [PATCH] Invert 'experimental' and 'rc-buggy'.

Before this patch, the list of suites is 'stable', 'testing', 'unstable' and
'rc-buggy', and the list of aliases is 'squeeze', 'wheezy', 'sid', and
'experimental', while 'rc-buggy' is the Toy Story name and 'experimental' is
the plain English name.  This patch corrects this inversion.
---
 lib/Deb/Versions.pm                  | 2 +-
 lib/Packages/Dispatcher.pm           | 2 +-
 lib/Packages/Search.pm               | 2 +-
 templates/config/archive_layout.tmpl | 2 +-
 templates/html/download.tmpl         | 2 +-
 templates/html/show.tmpl             | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 0e37ab2..9ac24e0 100644
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -179,7 +179,7 @@ our @SUITES_SORT = qw(
 			squeeze
 			testing testing-proposed-updates
 			wheezy
-			sid unstable experimental
+			sid unstable rc-buggy experimental
 			warty hoary breezy dapper edgy feisty gutsy hardy
 			intrepid jaunty karmic lucid maverick);
 our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 40a56f2..fbbc55c 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -67,7 +67,7 @@ sub do_dispatch {
     my %SUITES_ALIAS = ( stable => 'squeeze',
 			 testing => 'wheezy',
 			 unstable => 'sid',
-			 'rc-buggy' => 'experimental',
+			 'experimental' => 'rc-buggy',
 			 '6.0' => 'squeeze',
 			 'stable-backports' => 'squeeze-backports' );
 
diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 3a47e3d..f9b2983 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -105,7 +105,7 @@ sub fallback_suite {
     my $suite = shift;
     if ($suite =~ /^(\S+)-(?:updates|backports|volatile)/) {
 	return $1;
-    } elsif ($suite eq 'experimental') {
+    } elsif ($suite eq 'rc-buggy') {
 	return 'sid';
     } else {
 	return undef;
diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index 0026175..a727a6a 100644
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -7,7 +7,7 @@
 		squeeze => 'stable',
 		wheezy => 'testing',
 		sid => 'unstable',
-		experimental => 'rc-buggy',
+		rc-buggy => 'experimental',
 		   }
 
    section_titles = {
diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 9a93047..89e445b 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -38,7 +38,7 @@ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section
 </pre>
 <p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
 [%- END %]
-[% IF suite == "experimental" %]
+[% IF suite == "rc-buggy" %]
 <h2>[% g('Experimental package') %]</h2>
 <p>[% g('Warning: This package is from the <strong>experimental</strong> distribution. That means it is likely unstable or buggy, and it may even cause data loss. Please be sure to consult the changelog and other possible documentation before using it.') %]</p>
 [% END %]
diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 5d7bec3..0c4d73f 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -166,9 +166,9 @@
 </div> <!-- end pmoreinfo -->
 [% END %]
 
-[% IF suite == "experimental" || subsection == "debian-installer" %]
+[% IF suite == "rc-buggy" || subsection == "debian-installer" %]
 <div class="pconstantnag">
-[% IF suite == "experimental" %]
+[% IF suite == "rc-buggy" %]
 [% changelog_link = 'changelog';
    changelog_link = "$changelogs_url$files.changelog.path" %] 
 <h2>[% g('Experimental package') %]</h2>
-- 
1.8.2.rc0


Reply to: