Bug#913594: [apt-cacher-ng] Vcs-Git field lacks branch information

[James McCoy]

Control: reassign -1 apt-cacher-ng 3.2-1

On Tue, Nov 13, 2018 at 12:42:59PM +0100, Eduard Bloch wrote:
> Hallo,
> * Jens Reyer [Mon, Nov 12 2018, 08:19:27PM]:
> > https://tracker.debian.org/pkg/apt-cacher-ng believes that the git repo
> > is outdated, because it's looking at branch master instead of debian/sid.
> > 
> > To fix either adapt the salsa project, or debian/control.
> > 
> > Patch for the latter solution is attached.
> 
> Cannot confirm. Clicking "VCS: Git (Browse" leads to the correct branch.

That's because Vcs-Browse in debian/control points to the debian/sid
branch.  Vcs-Git does not.

Either the repo on Salsa should be configured to make debian/sid the
default branch, in which case Vcs-Browse can lose the branch
information, or Vcs-Git should use "-b debian/sid" as documented in
policy[0] and supported by the tools that understand Vcs-*.

[0]: 
https://www.debian.org/doc/debian-policy/ch-controlfields.html#version-control-system-vcs-fields

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB

Bug#896760: DDPO: add Salsa icon to VCS column

[James McCoy]

On Tue, Apr 24, 2018 at 10:27:47AM +0200, Daniel Pocock wrote:
> When looking at a long list of packages it is hard to see if any have
> been missed.  The VCS URLs don't make it obvious because sometimes the
> VCS has moved but there hasn't been a new upload of the package.

How would one detect that the VCS has moved if there hasn't been a new
upload?

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB

Bug#879232: qa.debian.org: [udd] Fix link for form in lintian template

[James McCoy]

Package: qa.debian.org
Severity: normal
Tags: patch
User: qa.debian@packages.debian.org
Usertags: udd

Submitting the form on https://udd.debian.org/lintian/ goes to the
maintainer dashboard instead of the lintian dashboard.  Attached patch
fixes this.

-- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.12.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 557ec71b17b6ac17575ca08e75b0b2afa90714ff Mon Sep 17 00:00:00 2001
From: James McCoy <james...@jamessan.com>
Date: Fri, 20 Oct 2017 15:40:02 -0400
Subject: [PATCH] Fix link for form in lintian template

---
 web/templates/lintian.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/lintian.erb b/web/templates/lintian.erb
index 9a74939..0e029a2 100644
--- a/web/templates/lintian.erb
+++ b/web/templates/lintian.erb
@@ -31,7 +31,7 @@
 
 
 Maintainer dashboard - Lintian
-
+
 
 
   <%= ERB.new(File.read(File.expand_path('templates/dmd-form.erb')), nil, nil, 
'_erbout01').result(binding) %>
-- 
2.15.0.rc1

Re: Bug#842829: UDD/uscan: devscripts needs to be upgraded to avoid some failures

[James McCoy]

On Tue, Nov 01, 2016 at 03:09:55PM -0400, James McCoy wrote:
> On Nov 1, 2016 11:33, "Lucas Nussbaum" <lu...@debian.org> wrote:
> > I tried with the first package listed.  It works fine with devscripts
> > 2.16.8 (in testing), but not with 2.16.4~bpo8+1 (in stable-bpo, and
> > installed on ullmann.debian.org).
> >
> > To fix that, an update of that backport is needed.
> 
> I've yet to do that because it would require a backport of the licensecheck
> package, too, since that was split out of devscripts.

Thanks to fsfs backporting licensecheck, I've updated devscripts'
backport to 2.17.5~bpo8+1.

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB

Bug#861168: qa.debian.org: msg parameter inserts extra line numbers

[James McCoy]

Control: retitle -1 [debsources] msg parameter displays extra line numbers when 
Javascript is disabled
Control: tag -1 confirmed

On Tue, Apr 25, 2017 at 05:57:48PM +0800, Paul Wise wrote:
> Normally the cowsay code header looks like this:
> 
> https://sources.debian.net/src/cowsay/3.03%2Bdfsg2-3/cowsay
> 
> 1   #!/usr/bin/perl
> 2
> 3   ##
> 4   ## Cowsay 3.03
> 5   ##
> 6   ## This file is part of cowsay.  (c) 1999-2000 Tony Monroe.
> 7   ##
> 
> When I add a msg parameter it looks like this:

Like this:

https://sources.debian.net/src/cowsay/3.03%2Bdfsg2-3/cowsay/?msg=4:title:message

> 1   #!/usr/bin/perl
> 2   
> 3   ##
> 4   ## Cowsay 3.03
> 5   
> 6   title
> 7   text
> 8   
> 9   ##
> 10  ## This file is part of cowsay.  (c) 1999-2000 Tony Monroe.
> 11  ##
> 
> I didn't expect that the msg paramer would insert line numbers,
> I would expect these line numbers instead:
> 
> 1   #!/usr/bin/perl
> 2   
> 3   ##
> 4   ## Cowsay 3.03
> 
> title
> text
> 
> 5   ##
> 6   ## This file is part of cowsay.  (c) 1999-2000 Tony Monroe.
> 7   ##

When I view that URL, it looks as per your expectations.  After
disabling Javascript, I see that the line numbers aren't adjusted.

Cheers,
James

Re: Bug#842829: UDD/uscan: devscripts needs to be upgraded to avoid some failures

[James McCoy]

On Nov 1, 2016 11:33, "Lucas Nussbaum"  wrote:
> I tried with the first package listed.  It works fine with devscripts
> 2.16.8 (in testing), but not with 2.16.4~bpo8+1 (in stable-bpo, and
> installed on ullmann.debian.org).
>
> To fix that, an update of that backport is needed.

I've yet to do that because it would require a backport of the licensecheck
package, too, since that was split out of devscripts.

Cheers,
James

Re: [UDD] unexpected changes of values in table upstream

[James McCoy]

On Wed, Mar 09, 2016 at 09:28:10AM +0100, Andreas Tille wrote:
> Hi,
> 
> when I query for the possible values of status I get:
> 
> udd=> select status, count(*) from upstream group by status ;
> status| count 
> --+---
>   |  4420
>  newer package available  |  4409
>  up to date   | 12650
>  error|  2716
>  only older package available |   914
> (5 Zeilen)
> 
> In the Blends code I'm querying for
> 
>  'Newer version available'
>  'up to date'
>  'error
>  'Debian version newer than remote site'
> 
> so these were the old values the upstream table was featuring until some
> point in time.

The strings are what uscan emits.  UDD is just parsing the output from
“uscan --dehs …”.

> I have no idea why and when (and also why without
> warning) this was changed but I think even from the meaning the new
> values are wrong:
> 
>   There is no "newer *package* available" since there is no such
>   package at upstream site.

It changed when a backport of devscripts >= 2.15.10 was installed on the
QA systems.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>

Bug#815980: tracker.debian.org: All packages have uscan issues

[James McCoy]

Control: reassign -1 devscripts 2.15.10
Control: retitle -1 "uscan --dehs" shouldn't send all output to stderr
Control: affects -1 qa.debian.org

On Fri, Feb 26, 2016 at 12:29:10PM +, James Cowgill wrote:
> > jcowgill@quantz:~$ psql service=udd -x -c "SELECT * FROM upstream WHERE 
> > source='easytag'"
> > -[ RECORD 1 
> > ]---+-
> > source  | easytag
> > version | 2.4.2-1
> > distribution| debian
> > release | sid
> > component   | main
> > watch_file  | version=3
> > | 
> > http://ftp.gnome.org/pub/GNOME/sources/easytag/(\d.)+/ \
> > | easytag-([\d.]+)\.tar\.xz
> > | 
> > signing_key_pgp | 
> > signing_key_asc | 
> > debian_uversion | 2.4.2
> > debian_mangled_uversion | 2.4.2
> > upstream_version| 2.4.2
> > upstream_url| 
> > http://ftp.gnome.org/pub/GNOME/sources/easytag/2.4/easytag-2.4.2.tar.xz
> > errors  | uscan output on stderr: uscan: Newest version of 
> > easytag on remote site is 2.4.2, local version is 2.4.2
> > | uscan warn: No upstream tarball downloaded.  No 
> > further processing with mk_origtargz ...
> > | 
> > | 
> > warnings| No upstream tarball downloaded.  No further 
> > processing with mk_origtargz ...
> > | 
> > status  | up to date
> > last_check  | 2016-02-26 00:04:48.688531
> 
> My guess is that this was triggered in UDD when devscripts 2.16.1 got
> uploaded to jessie-backports. In devscripts 2.15.10, the interface to
> uscan changed with everything being printed to stderr (even if it's not
> an error) if --dehs is used.

Then this is what needs to be fixed.  The behavior, especially for
something that's intended to be used by automation, shouldn't have
changed such that it broke the major user of such functionality.

Reassigning to devscripts.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>

Bug#814204: UDD: upstream.rb cannot handle version=4 d/watch files

[James McCoy]

On Tue, Feb 09, 2016 at 06:16:00AM -0500, James McCoy wrote:
> On Feb 9, 2016 1:24 AM, "Stuart Prescott" <stu...@debian.org> wrote:
> > Upgrading devscripts on ullmann.d.o to a new backported version of 
> > devscripts
> > will solve this; the backport does not currently exist in jessie-backports.
> 
> I've been holding off doing a backport until things settle down with bug
> reports. A new devscripts upload will be happening soon.  If there's not too
> much noise after that, I'll backport.

FWIW, the backport was uploaded a couple days ago.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>

Bug#814204: UDD: upstream.rb cannot handle version=4 d/watch files

[James McCoy]

On Feb 9, 2016 1:24 AM, "Stuart Prescott"  wrote:
> Upgrading devscripts on ullmann.d.o to a new backported version of
devscripts
> will solve this; the backport does not currently exist in
jessie-backports.

I've been holding off doing a backport until things settle down with bug
reports. A new devscripts upload will be happening soon.  If there's not
too much noise after that, I'll backport.

Cheers,
James

Bug#807292: dose: ancient modified embedded code copy of debianbts.py

[James McCoy]

On Dec 7, 2015 2:06 AM, "Paul Wise"  wrote:
> I noticed the dose git repository contains a modified embedded code
> copy of debianbts.py from python-debianbts 1.11 or 1.9. Please remove
> it from the dose git repository and from the dose copy in the qa
> subversion repository and switch to the system debianbts.

Has there been a stable update of python-debianbts to batch requests to the
bts?

Cheers,
James

Re: Changes in mail and news handling of tracker.debian.org

[James McCoy]

On Fri, Dec 04, 2015 at 11:20:25PM +0100, Raphael Hertzog wrote:
> Next step is to transfer all mail subscriptions from packages.qa.debian.org
> to tracker.debian.org and to close the mail part on
> packages.qa.debian.org (mails to p...@qa.debian.org will be redirected to
> cont...@tracker.debian.org). But this will affect many people and I want
> to send out an announce on debian-devel-annouce when it's done...

How long do you expect to keep p...@qa.debian.org forwarding enabled?
At least pts-subscribe(1) will need to be transitioned if there's an
intention of eventually disabling p...@qa.debian.org.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>

Bug#806253: libidl-2-0: trying to overwrite '/usr/lib/x86_64-linux-gnu/libIDL-2.so.0.0.0', which is also in package libidl0:amd64 0.8.14-1

[James McCoy]

Package: libidl-2-0
Version: 0.8.14-2
Severity: serious
Justification: Policy 7.6

Since libidl0 was renamed to libidl-2-0, the new libidl-2-0 needs to
declare Breaks/Replaces on libidl0 (<< 0.8.14-2) per policy §7.6.1.
As this wasn't done when the package was renamed, an upgrade currently
fails:

Unpacking libidl-2-0:amd64 (0.8.14-3) ...
dpkg: error processing archive 
/var/cache/apt/archives/libidl-2-0_0.8.14-3_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/x86_64-linux-gnu/libIDL-2.so.0.0.0', which is 
also in package libidl0:amd64 0.8.14-1

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, arm64

Kernel: Linux 4.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Bug#805128: Replace outdated copy of dd-list with wrapper around dd-list

[James McCoy]

Package: qa.debian.org
Tags: patch

Starting with devscripts 2.15.9, the functionality from QA's copy of
dd-list has been integrated.  The only missing piece is automatically
using the specific sources files of interest for the QA infrastructure.

Converting /srv/qa.debian.org/bin/dd-list to a wrapper around the
actual dd-list, as the attached patch does, enables adding the relevant
sources files to the dd-list command and doesn't break the various calls
to dd-list.

I've already sent a request to debian-admin to get an updated version of
devscripts installed, so once that's complete this patch can be applied.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
From 484c5120220383ef50870e90b8a0931b61f36847 Mon Sep 17 00:00:00 2001
From: James McCoy <james...@debian.org>
Date: Sat, 14 Nov 2015 20:52:50 -0500
Subject: [PATCH] Replace outdated copy of dd-list with wrapper around dd-list

Starting with devscripts 2.15.9, the functionality from QA's copy of
dd-list has been integrated.  The only missing piece is automatically
using the specific sources files of interest for the QA infrastructure.

Converting /srv/qa.debian.org/bin/dd-list to a wrapper around the
actual dd-list enables adding the relevant sources files to the dd-list
command and doesn't break the various calls to dd-list.
---
 bin/dd-list | 286 ++--
 1 file changed, 5 insertions(+), 281 deletions(-)

diff --git a/bin/dd-list b/bin/dd-list
index c5fc7e6..67e17a5 100755
--- a/bin/dd-list
+++ b/bin/dd-list
@@ -1,283 +1,7 @@
-#!/usr/bin/perl -w
-#
-# dd-list: Generate a list of maintainers of packages.
-#
-# Written by Joey Hess <jo...@debian.org>
-# Based on a python implementation by Lars Wirzenius.
-# Copyright 2005 Lars Wirzenius, Joey Hess
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#!/bin/sh
 
-# changes between dd-list 2.10.69+squeeze4 and this dd-list :
-#
-# Copyright (C) 2012 Bart Martens <ba...@knars.be>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+for sources in /srv/mirrors/debian/dists/unstable/*/source/Sources.gz /srv/mirrors/debian/dists/experimental/*/source/Sources.gz; do
+set -- "$@" -s "$sources"
+done
 
-use strict;
-use Getopt::Long;
-
-my $version='2.10.69+squeeze4+bartm';
-
-my %arch;
-
-sub read_arch
-{
-	my $count = 0;
-
-	foreach my $dist ( "unstable", "experimental" )
-	{
-		my $package = undef;
-		my $maintainer = undef;
-		my $uploaders = undef;
-	
-		open INPUT, "zcat /srv/mirrors/debian/dists/$dist/*/source/Sources.gz |" or die "failed to read $dist Sources files";
-		while()
-		{
-			chomp;
-	
-			$package = $1 if( /^Package: (.*)/ );
-			$maintainer = $1 if( /^Maintainer: (.*)/ );
-			$uploaders = $1 if( /^Uploaders: (.*)/ );
-	
-			if( /^$/ )
-			{
-die "$package" if( not defined $package );
-
-$count++ if( not defined $arch{$package}{$dist}{"Maintainer"} );
-	
-delete $arch{$dist}{$package}{"Maintainer"};
-delete $arch{$dist}{$package}{"Uploaders"};
-	
-$arch{$dist}{$package}{"Maintainer"} = $maintainer if( defined $maintainer );
-$arch{$dist}{$package}{"Uploaders"} = $uploaders if( defined $uploaders );
-	
-$package = undef;
-$maintainer = undef;
-$uploaders = undef;
-			}
-		}
-	}
-
-	die "low number of packages in Sources files: $count" if( $count < 2 ); # 20768 on 2012-12-02
-}
-
-sub undef2empty
-{
-	my $value = shift;
-	return "" if( not defined $value );
-	return $value;
-}
-
-sub get_developers_given_package {
-	my ($package_name,$print_binary,$dist) = @_;
-
-	my $developer;
-	my $uploaders;
-	my @uploader

Re: Bug#788820: dd-list fixed in devscripts 2.15.9

[James McCoy]

On Sat, Oct 10, 2015 at 05:10:17PM +0800, Paul Wise wrote:
> On Tue, 2015-10-06 at 01:19 +0000, James McCoy wrote:
> 
> >    * dd-list:
> >  + Omit information from stanzas with “Extra-Source-Only: yes”.
> >  + Use only the information from the most recent version of a package
> >    within each sources file.  (Closes: #788820)
> 
> Thanks for that James.
> 
> Bart, could you update the devscripts embedded code copy on
> quantz.debian.org to version 2.15.9?

It's going to require some changes to how dd-list is currently being
called by the QA scripts.  I was planning on sending a patch for that
after the devscripts backport is updated.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>

Re: darcs.debian.org broken?

[James McCoy]

On Sun, Jul 19, 2015 at 02:24:17PM +0200, Joachim Breitner wrote:
 Concrete proposal:
 VCS-Git: alioth.debian.org:/git/pkg-haskell/DHG_packages.git#p/haskell-foo
 
 Where the # separates the subpath from the uri. This way, you can
 actually paste the whole URL after git clone, as # starts a bash
 comment, although that’s a minor point.

Actually, the # isn't parsed as a comment since it is mid-word.

jamessan@freya:~$ touch foo#bar
jamessan@freya:~$ ls foo*
foo#bar

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


-- 
To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20150719125700.gb2...@freya.jamessan.com

Re: darcs.debian.org broken?

[James McCoy]

On Sat, Jul 18, 2015 at 08:24:51PM +0200, Simon Kainz wrote:
 DUCK [1] just informed me, that there are ~750 issues with VCS-Darcs
 URLS [2], mosty 404. This seems to be the fact since now 3 days.
 Please take care of that.

This is due to the Darcs repositories being decommissioned[0] and moved
to git.

[0]: https://lists.debian.org/debian-haskell/2015/07/msg00060.html

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Re: Bug#782677: udd: scripts/update-upstream-status: should consider sepwatch

[James McCoy]

On Tue, Jun 30, 2015 at 08:15:49PM +0200, Lucas Nussbaum wrote:
 On 30/06/15 at 17:47 +, Bart Martens wrote:
   How different is mole's data schema from UDD's?
  
  I guess you already have access to UDD's data schema. Can you access 
  mole.watch
  with what you read in udd-dehs?
 
 It seems that udd-dehs doesn't keep track of both unstable and
 experimental. Some packages track different branches and different
 suites, and thus have different watch files.
 
 Also, I'm surprised that the executable is named
 'uscan-without-pgpsigurlmangle'. Does it mean that it doesn't check PGP
 signatures even when a signing key is provided? That sounds like a bad
 idea.

Since all the check is doing is looking at versions, not downloading the
actual archive, why does the key matter?

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


-- 
To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20150630220819.gd1...@freya.jamessan.com

Bug#790386: tracker.debian.org: Replace gitweb URLs with cgit

[James McCoy]

Package: tracker.debian.org
Severity: normal
Tags: patch

The gitweb interface isn't fully functional, so updating the Alioth URLs
to use cgit provides a better experience to the user.

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
From 02390845b35a0525f7e1bb6aff2b05ebcb3fc8dc Mon Sep 17 00:00:00 2001
From: James McCoy james...@debian.org
Date: Sun, 28 Jun 2015 15:07:50 -0400
Subject: [PATCH] Replace gitweb URLs with cgit

---
 debian/control | 2 +-
 debian/copyright   | 2 +-
 distro_tracker/core/templates/core/footer.html | 2 +-
 docs/contributing.rst  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 5f41407..ee134f4 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (= 9),
 Standards-Version: 3.9.5
 Homepage: https://wiki.debian.org/qa.debian.org/distro-tracker
 Vcs-Git: git://anonscm.debian.org/qa/distro-tracker.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=qa/distro-tracker.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/qa/distro-tracker.git
 X-Python-Version: = 2.7
 
 Package: distro-tracker
diff --git a/debian/copyright b/debian/copyright
index b097d52..48798f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: DistroTracker
-Source: http://anonscm.debian.org/gitweb/?p=qa/distro-tracker.git
+Source: http://anonscm.debian.org/cgit/qa/distro-tracker.git
 
 Files: *
 Copyright: 2013 Marko Lalic marko.la...@gmail.com
diff --git a/distro_tracker/core/templates/core/footer.html b/distro_tracker/core/templates/core/footer.html
index a234dcb..4c35f8e 100644
--- a/distro_tracker/core/templates/core/footer.html
+++ b/distro_tracker/core/templates/core/footer.html
@@ -2,5 +2,5 @@
 div id=footer-copyright
 a href=http://deb.li/DTAuthors;Copyright/a 2013-2014 The Distro Tracker Developers/div
 div id=footer-repository
-a href=https://anonscm.debian.org/gitweb/?p=qa/distro-tracker.git;Git Repository/a
+a href=https://anonscm.debian.org/cgit/qa/distro-tracker.git;Git Repository/a
 /div
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 245a9af..11ddd29 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -39,7 +39,7 @@ Usual workflow
$ git clone git://anonscm.debian.org/qa/distro-tracker.git
 
  Note that you can also browse the sources at
- https://anonscm.debian.org/gitweb/?p=qa/distro-tracker.git
+ https://anonscm.debian.org/cgit/qa/distro-tracker.git
 
   2. Follow the steps in the chapter :ref:`setting-up`.
 
-- 
2.1.4

Re: sf.net redirector broken?

[James McCoy]

On Sat, May 30, 2015 at 12:55:27PM -0400, Michael Gilbert wrote:
 Running uscan on packages using the sf.net redirector will results in:
 $ uscan --verbose --report
 uscan warning: In debian/watch,
   no matching hrefs for watch line
   http://sf.net/wine/wine-(.+)\.tar\.bz2
 -- Scan finished

Fallout from the upgrade to Jessie, it seems:

[Sat May 30 07:22:51.153551 2015] [:error] [pid 22026] [client 
5.48.220.179:36535] PHP Warning:  simplexml_load_file(): SSL operation failed 
with code 1. OpenSSL Error messages:\nerror:14090086:SSL 
routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed in 
/srv/qa.debian.org/web/watch/sf.php on line 18
[Sat May 30 07:22:51.153684 2015] [:error] [pid 22026] [client 
5.48.220.179:36535] PHP Warning:  simplexml_load_file(): Failed to enable 
crypto in /srv/qa.debian.org/web/watch/sf.php on line 18
[Sat May 30 07:22:51.153860 2015] [:error] [pid 22026] [client 
5.48.220.179:36535] PHP Warning:  
simplexml_load_file(https://sourceforge.net/projects/limitcpu/rss?limit=1000):
 failed to open stream: operation failed in /srv/qa.debian.org/web/watch/sf.php 
on line 18
[Sat May 30 07:22:51.153954 2015] [:error] [pid 22026] [client 
5.48.220.179:36535] PHP Warning:  simplexml_load_file(): I/O warning : failed 
to load external entity 
quot;https://sourceforge.net/projects/limitcpu/rss?limit=1000quot;
 in /srv/qa.debian.org/web/watch/sf.php on line 18

Not sure what needs to be fixed, off-hand.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Bug#787225: qa.debian.org: Bug graph URLs (/data/bts/graphs/…) reporting 403 errors

[James McCoy]

Package: qa.debian.org
Severity: normal

This is likely more fallout from the jessie upgrade.

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)


-- 
To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20150530001726.6815.80928.report...@freya.jamessan.com

Re: Package modifying a user-modified config file? [Bug #780797]

[James McCoy]

On Sat, Mar 21, 2015 at 04:36:20PM -0400, Chris Knadle wrote:
 On 03/21/2015 04:10 PM, Jakub Wilk wrote:
  The only trouble is /etc/ssh/sshd_config, which is not a conffile for
  whatever reason.
 
 Ugh.  Any file in /etc should be a conffile by Policy AFAICT so if
 this is so I should probably file a bug about it.

No, there are both configuration files and conffiles according to
policy (c.f. §10.7.1).  The latter are what dpkg will prompt about when
there are user modifications and the package is shipping a changed
conffile.  Note that there is only a prompt when the user has modified
it.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Re: altos tracking wrong branch

[James McCoy]

On Tue, Feb 24, 2015 at 10:47:34AM -0700, Bdale Garbee wrote:
 It looks like https://qa.debian.org/cgi-bin/vcswatch?package=altos is
 tracking the master branch .. it should probably be tracking the debian
 branch instead.

The default branch when cloning git://git.gag.com/fw/altos is master,
not debian.  The expectation is that cloning the Vcs-Git URL would
provide the packaging branch.

Given that the repo is also used for upstream development, it makes
sense that master is the default branch instead of changing it to
debian.  However, that means the Vcs-Git field should probably be
changed to

  git://git.gag.com/fw/altos -b debian

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


-- 
To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20150225013956.gs1...@freya.jamessan.com

Bug#772560: debsources: please add a CA-signed SSL setup

[James McCoy]

On Tue, Dec 23, 2014 at 05:22:21PM +0100, Stefano Zacchiroli wrote:
 On Mon, Dec 08, 2014 at 11:42:40PM +0800, Paul Wise wrote:
  Please add an SSL certificate signed by the CAs so that users visiting
  the site over SSL don't get warnings from their browsers.
 
 This has now been done.
 
 There are still some links pointing from https:// to http://, which
 makes browsers not 100% happy, but the identify is verified at least.
 Patches (and/or separate bug reports) welcome to fix the https - http
 links.

Would that just be a matter of using scheme-relative links (i.e., a
href=//foo)?

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Bug#772560: debsources: please add a CA-signed SSL setup

[James McCoy]

On Dec 23, 2014 10:22 PM, Paul Wise p...@debian.org wrote:
 I think it would be better to link to https only because debian.org
 services redirect all sites to https (except www.d.o but that uses a
 HSTS/CSS trick to redirect to https).

I disagree.

Debsources itself isn't something that specifically warrants https-only
access, so we should enable the amin deploying the code to make that choice
for herself.  Using scheme-relative URLs enables that choice.

Debian has chosen to use https, so our instance of the service can be
configured at the httpd level to only allow https access.

Cheers,
James

Re: sf.net redirector broken

[James McCoy]

On Fri, Oct 10, 2014 at 01:30:21PM +0200, Axel Beckert wrote:
 it seems as if the uscan sf.net redirector at
 https://qa.debian.org/watch/sf.php/ is broken for at least a few days:

It's actually uscan that's broken (c.f. #764367).  I'll be uploading a
fix soon.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Bug#764779: Sourceforge.net redirector downloads HTML instead of target file

[James McCoy]

Control: reassign -1 devscripts
Control: forcemerge 764367 -1

On Fri, Oct 10, 2014 at 07:14:44PM -0400, Ari Pollak wrote:
 When I use uscan to download, say,
 https://qa.debian.org/watch/sf.php/pidgin/pidgin-2.10.9.tar.bz2.asc,
 it downloads an HTML redirector page instead of the target file.

This is a problem in uscan, not in the redirector.  In devscripts
2.14.7, we started adding a Referer header in uscan's HTTP requests.
When Sourceforge gets a request to download an archive with a Referer
header present (or more likely, one that isn't from Sourceforge), it
responds with the Your download will start in 5 seconds page, which
uscan gladly downloads.

A fix is pending and will be uploaded soon.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Re: Help me with tracker.debian.org

[James McCoy]

On Sun, Jul 13, 2014 at 11:10:59PM +0800, Paul Wise wrote:
 I've prepared some things to be added to the TODO file, based on the
 capabilities of PTS and various things I noticed while auditing the
 PTS and tracker code and templates. I'm happy to help work on some of
 them as I find time to do so.
 
 Output:
 
 …
 problems - co-maintainers suggestion for no uploaders  priority
 standard/required/important

This is actually a problem in both PTS/tracker.  The root cause is the
Sources file doesn't always provide accurate information (#626394).

In order to properly determine the priority of a source package, one
would need to find the highest priority among, in order of increasing
reliability but also, I think, increasing changes to tracker code:

- source package's Priority field.  This is what's currently used, but
  under specific conditions it reports source instead.
- source package's Package-List field.  This field may not be present
  and may not list all binary packages when it is present.
- binary package's Priority field.  This requires mapping all the binary
  packages back to the source package and then determining the highest
  priority among them.  Ideally, this is what dak would do when
  generating the Sources file, since it should have all the necessary
  information then.

 opensearchdescription

Isn't this done now?

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Bug#754438: tracker.debian.org: Misuses a tags for priority/section titles

[James McCoy]

Package: tracker.debian.org
Severity: minor
Tags: patch

Attached patch changes the a to span, as in the PTS.  This avoids
presenting the descriptions as links when they aren't.
From 83d6d3cc1e7bcaed46cce9dbc903ab563cd0e02d Mon Sep 17 00:00:00 2001
From: James McCoy james...@debian.org
Date: Thu, 10 Jul 2014 21:18:08 -0400
Subject: [PATCH] Use span tags to set priority/section titles

The a tag makes the priority/section descriptions falsely show as
links.  Given the tags are only being used for the title, a span tag
is sufficient.

Signed-off-by: James McCoy james...@debian.org
---
 distro_tracker/core/templates/core/panels/general.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distro_tracker/core/templates/core/panels/general.html b/distro_tracker/core/templates/core/panels/general.html
index d54bb7d..6366922 100644
--- a/distro_tracker/core/templates/core/panels/general.html
+++ b/distro_tracker/core/templates/core/panels/general.html
@@ -11,7 +11,7 @@
 a href={{ url }}{{ context.name }}/a
 {% endwith %}
 {% if context.priority %}
-span(a href=# title=priority{{ context.priority }}/a, a href=# title=section{{ context.section }}/a)/span
+(span title=priority{{ context.priority }}/span, span title=section{{ context.section }}/span)
 {% endif %}
 /div
 div class=clear/div
-- 
2.0.1

Bug#753076: UDD/ftpnew: Various packages missing

[James McCoy]

Package: qa.debian.org
Severity: normal
User: qa.debian@packages.debian.org
Usertags: udd

Not all of the packages from the NEW queue are showing up in UDD's
tables.  This affects rmadison/madison.cgi's information with respect to
the affected packages.

As a simple example, pyjamas has been in NEW for a few months:

$ curl https://ftp-master.debian.org/new.822 2/dev/null | grep-dctrl -FSource 
pyjamas
Source: pyjamas
Binary: pyjamas-pyjs, pyjamas-ui, pyjamas-gmap, pyjamas-canvas, pyjamas-doc, 
pyjamas, pyjamas-gchart
Version: 0.8.1
Architectures: source, all
Age: 3 months
Last-Modified: 1395106402
Queue: new
Maintainer: Luke Kenneth Casson Leighton l...@lkcl.net
Changed-By: lkcl l...@lkcl.net
Sponsored-By: ph...@debian.org
Distribution: unstable
Fingerprint: DFF1415ACE3227FCF20707D6D04BA3A00125D5C0
Closes: #710033
Changes-File: pyjamas_0.8.1_amd64.changes


However it doesn't show up in UDD:

$ rmadison -u new pyjamas
$

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


-- 
To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20140629023348.18093.93974.report...@freya.jamessan.com

Re: Suspicious value in carnivore table:

[James McCoy]

On Mar 1, 2014 1:51 PM, Andreas Tille andr...@an3as.eu wrote:
 udd=# select * from carnivore_names where id = 731;
  id  |name
 -+-
  731 | James McCoy
  731 | James Vega
 (2 Zeilen)

 The key in the keys table belongs to James McCoy but I wonder how it can
 be that the name is resolved via the same ID also to James Vega.

When I created the 61326D40 key, my name was James Vega. A couple years ago
I married and changed my name to James McCoy, at which point I figured I
should finally transition to a 4096R key.

Cheers,
James

Re: request to install newer version of descripts on quantz

[James McCoy]

On Thu, Jan 23, 2014 at 10:50:21PM +, Bart Martens wrote:
 It would be nice to get bug 712261 fixed on quantz.  Can you upgrade 
 devscripts
 on quantz to 2.13.4~bpo70+1 or 2.13.9 please ?

FWIW, I intend to do another upload of devscripts in the next couple
days to fix a few more issues in the pgpsigurlmangle support and support
armored keyrings.  I'll also be backporting that once it hits testing.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Bug#730438: UDD: bugs.cgi confused: lists bugs as affecting sid even if the package has been removed

[James McCoy]

On Mon, Nov 25, 2013 at 03:13:51AM +0100, Andreas Beckmann wrote:
 UDD seems be be a bit confused about some bugs, too:
 query for closed bugs affecting sid (all bugs), and you will find
 several kfreebsd-8 bugs there, e.g. #725575
 but kfreebsd-8 has been removed from jessie and sid ...
 Maybe the sid and jessie tags add to the confusion, but they are needed.

Isn't this due to debian-installer-7.0-netboot-kfreebsd-* referencing
kfreebsd-8 from their Built-Using field?  This means the source for
kfreebsd-8 is still part of sid:

$ rmadison kfreebsd-8
 kfreebsd-8 | 8.1+dfsg-8+squeeze3 | squeeze-security  | source
 kfreebsd-8 | 8.1+dfsg-8+squeeze4 | squeeze   | source
 kfreebsd-8 | 8.2-15~bpo60+1  | squeeze-backports | source
 kfreebsd-8 | 8.3-6   | wheezy| source

 Cheers,
 -- 
 James


-- 
To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20131125173605.ga10...@usenmccoyj1d2c.corp.emc.com

Re: Huge list of broken Vcs-Svn entries in control files

[James McCoy]

On Wed, Aug 28, 2013 at 10:27:33AM +0200, Andreas Tille wrote:
 On Mon, Aug 26, 2013 at 07:55:44AM -0400, James McCoy wrote:
   _BUT_: After changing svn://svn.debian.org/... to
   svn://anonscm.debian.org/... makes it work again:
  
  See also http://lintian.debian.org/tags/vcs-field-not-canonical.html,
  so maintainers should be aware of the problem.
 
 IMHO this is the wrong attitude.  While I tend to respect lintian issues
 of severity info you can not at all expect maintainers to just seek long
 standing bug free packages for such things and upload packages just
 because of this.

My reason for pointing out the lintian check was that there exists a
mechanism to inform maintainers that their Vcs-* URLs aren't canonical.
The description for the the tag states that the non-canonical URLs will
still work due to redirections, but that it would be beneficial to
update them.

Nothing about that implies that one needs to upload a new package just
to fix this tag.  It just means that if one happens to address that in
the course of a normal upload, tools using their Vcs-* URLs will be
slightly more performant and less likely to have transient failures.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Re: Huge list of broken Vcs-Svn entries in control files

[James McCoy]

On Wed, Aug 28, 2013 at 01:52:25PM +0200, Andreas Tille wrote:
 Hi James,
 
 On Wed, Aug 28, 2013 at 07:48:06AM -0400, James McCoy wrote:
See also http://lintian.debian.org/tags/vcs-field-not-canonical.html,
so maintainers should be aware of the problem.
   
   IMHO this is the wrong attitude.  While I tend to respect lintian issues
   of severity info you can not at all expect maintainers to just seek long
   standing bug free packages for such things and upload packages just
   because of this.
  
  My reason for pointing out the lintian check was that there exists a
  mechanism to inform maintainers that their Vcs-* URLs aren't canonical.
 
 OK.
 
  The description for the the tag states that the non-canonical URLs will
  still work due to redirections, but that it would be beneficial to
  update them.
 
 What exactly is the benefit?

The requests go to the proper host instead of being redirected to a
different host.

$ host anonscm.debian.org
anonscm.debian.org has address 217.196.43.132
$ host svn.debian.org
svn.debian.org has address 217.196.43.140
svn.debian.org mail is handled by 0 .

It also avoids the possibility of problems with the redirection, which
are likely very few and far between, but do happen as evidenced by this
thread.

  Nothing about that implies that one needs to upload a new package just
  to fix this tag.  It just means that if one happens to address that in
  the course of a normal upload, tools using their Vcs-* URLs will be
  slightly more performant and less likely to have transient failures.
 
 In how far will it be more performant to use anonscm?

However much it costs to do the redirection.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Re: Huge list of broken Vcs-Svn entries in control files

[James McCoy]

On Mon, Aug 26, 2013 at 08:36:21AM +0200, Simon Kainz wrote:
 Currently (as of 2012-08-26) duck.debian.net shows me 9301 binary
 packages with URL issues, resulting from 4318 source packages.
 
 …
 
 There Vcs-Svn: points to
 svn://svn.debian.org/svn/debian-hebrew/pkg/bidiui and Vcs-Browser
 points to http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiui/
 
 Using the Vcs-Browser link, my browser ultimately points to
 http://anonscm.debian.org/viewvc/debian-hebrew/pkg/bidiui/, so there
 must be some rewrite rule/vhost config/magic fairy to make this work -
 So Vcs-Browser _works!_
 
 Using the svn cli too, i get:
 
 skainz@zidpc9027:~$ svn info
 svn://svn.debian.org/svn/debian-hebrew/pkg/bidiui
 svn: No repository found in
 'svn://svn.debian.org/svn/debian-hebrew/pkg/bidiui'
 
 _BUT_: After changing svn://svn.debian.org/... to
 svn://anonscm.debian.org/... makes it work again:

See also http://lintian.debian.org/tags/vcs-field-not-canonical.html,
so maintainers should be aware of the problem.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Accepting uscan patches (Was: Re: [Debian Wiki] Mise à jour de « debian/watch » par PaulWise)

[James McCoy]

On Thu, Aug 01, 2013 at 12:10:32PM +0200, Andreas Tille wrote:
 Besides the fact that it was mentioned that there is such a bug I wonder
 how bugs for devscripts are really handled.  I did opened two bugs, created
 a Git repository with patches, described things in Wiki[1] ... and now?

As was mentioned in the wiki, we were waiting for Wheezy to release.
That's happened and I'm trying to work through the backlog of requested
features for devscripts' scripts.  This was near the top of my list, but
I've been a little strapped for time.  It hasn't been forgotten, though.

 I was asked several times when all people could profit.  I added some
 hint given by Benjamin Drung about automatic test cases to the Wiki[2] -
 but I do not really feel competent to push this forward (and I wonder
 actually why exactly for this patch this test case feature should be
 required).

Now that we have a test infrastructure, we prefer to have tests
accompany new functionality.  Unlike the wiki suggests, this requires no
knowledge of Perl.  The tests are for the UI of the scripts and
therefore are written in shell.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org


signature.asc
Description: Digital signature

Bug#688446: qa.debian.org: Please update PTS in view of the new DM procedures

[James McCoy]

On Wed, Nov 28, 2012 at 12:07:05AM -0500, James McCoy wrote:
 Attached is a series of a patches that adds support for displaying DM
 information by each maintainer/uploader's name.

 From 3a6f6f158e8905176689715b5d389bd37244bb98 Mon Sep 17 00:00:00 2001
 From: James McCoy vega.ja...@gmail.com
 Date: Mon, 26 Nov 2012 22:10:11 -0500
 Subject: [PATCH 4/5] Add indicate-dm template and use it to annotate the
  maintainer/uploaders

Using a template for that was a bit overkill.  The attached patch
replaces this one.  It inlines the dm annotation and uses small for
the maintainer annotation to fit with the style of the other
parenthetical pieces on information.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy james...@debian.org
From bbebc80dc37fda090f709eef5f005f8c4d713b56 Mon Sep 17 00:00:00 2001
From: James McCoy vega.ja...@gmail.com
Date: Mon, 26 Nov 2012 22:10:11 -0500
Subject: [PATCH 4/5] Use the gathered dm information to annotate the
 maintainer/uploaders

---
 www/xsl/pts.xsl |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/www/xsl/pts.xsl b/www/xsl/pts.xsl
index 653dac5..bc58917 100644
--- a/www/xsl/pts.xsl
+++ b/www/xsl/pts.xsl
@@ -271,6 +271,9 @@ other-to-%xx, especially % to %25... Fortunately, that's rare --
 	xsl:value-of select=maintainer/name/
 	  /span
 	/xsl:element
+	xsl:if test=$hasother and $other/dms/item/@email=maintainer/email
+	  (smalldm/small)
+	/xsl:if
 	xsl:if test=uploaders
   xsl:for-each select=uploaders/item
 	xsl:text, /xsl:text
@@ -289,7 +292,11 @@ other-to-%xx, especially % to %25... Fortunately, that's rare --
 		  xsl:value-of select=name/
 		/span
 	  /xsl:element
-	  xsl:text (u)/xsl:text
+	  xsl:text (u/xsl:text
+	  xsl:if test=$hasother and $other/dms/item/@email=email
+		, dm
+	  /xsl:if
+	  xsl:text)/xsl:text
 	  /small
 	/span
   /xsl:for-each
-- 
1.7.10.4



signature.asc
Description: Digital signature