From 2f93abf0c7a5ccb9f3eae772586ddeacb87747d7 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 12 Jun 2010 23:23:48 +0200
Subject: [PATCH] add support for finger command line for db.debian.org query

---
 ddportfolioservice/controllers/ddportfolio.py |   3 +-
 .../i18n/ddportfolioservice.pot               |  40 +++++++++--------
 .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 6796 -> 6910 bytes
 .../i18n/de/LC_MESSAGES/ddportfolioservice.po |  42 ++++++++++--------
 ddportfolioservice/model/ddportfolio.ini      |   5 ++-
 5 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py
index 34663d2..b8fd306 100644
--- a/ddportfolioservice/controllers/ddportfolio.py
+++ b/ddportfolioservice/controllers/ddportfolio.py
@@ -88,7 +88,8 @@ developer name on all bug logs)'),
         'membership' : {
             'label' : N_('Membership'),
             'nm' : N_('NM'),
-            'db' : N_('DB'),
+            'dbfinger' : N_('DB information via finger'),
+            'db' : N_('DB information via HTTP'),
             'alioth' : N_('Alioth'),
             'wiki' : N_('Wiki'),
             'forum' : N_('Forum'),
diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot
index ce684ea..6caf351 100644
--- a/ddportfolioservice/i18n/ddportfolioservice.pot
+++ b/ddportfolioservice/i18n/ddportfolioservice.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-06-12 00:46+0200\n"
+"POT-Creation-Date: 2010-06-12 23:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,7 +146,7 @@ msgid "oldpeople"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:86
-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: ddportfolioservice/controllers/ddportfolio.py:93
 msgid "Alioth"
 msgstr ""
 
@@ -159,68 +159,72 @@ msgid "NM"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:91
-msgid "DB"
+msgid "DB information via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:93
-msgid "Wiki"
+#: ddportfolioservice/controllers/ddportfolio.py:92
+msgid "DB information via HTTP"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:94
+msgid "Wiki"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:95
 msgid "Forum"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: ddportfolioservice/controllers/ddportfolio.py:98
 msgid "Miscellaneous"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: ddportfolioservice/controllers/ddportfolio.py:99
 msgid "debtags"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: ddportfolioservice/controllers/ddportfolio.py:100
 msgid "links"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:100
+#: ddportfolioservice/controllers/ddportfolio.py:101
 msgid "Debian website"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:101
+#: ddportfolioservice/controllers/ddportfolio.py:102
 msgid "Debian search"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: ddportfolioservice/controllers/ddportfolio.py:103
 msgid "GPG public key via finger"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: ddportfolioservice/controllers/ddportfolio.py:104
 msgid "GPG public key via HTTP"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: ddportfolioservice/controllers/ddportfolio.py:107
 msgid "Information reachable via ssh (for DDs)"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: ddportfolioservice/controllers/ddportfolio.py:108
 msgid "owned debian.net domains"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: ddportfolioservice/controllers/ddportfolio.py:109
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
 "information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: ddportfolioservice/controllers/ddportfolio.py:110
 msgid "Group membership information"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: ddportfolioservice/controllers/ddportfolio.py:113
 msgid "Ubuntu"
 msgstr ""
 
-#: ddportfolioservice/controllers/ddportfolio.py:113
+#: ddportfolioservice/controllers/ddportfolio.py:114
 msgid "Available patches from Ubuntu"
 msgstr ""
 
diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
index 48cb6e798e0d75b3e2bf4285de173f6e1fedec11..c898049c362b0b9ff0d432b3d5509658e61824f1 100644
GIT binary patch
delta 1519
zcmZwHTS${(9LMp;<xDdV)3Q92E6q|oq)SB26iw6=W+g?CqQn-vXo`qe)+hsS7Ks)Z
z(K(HbAXpGlS3%K5K?q&Cf<Pg#n+y`u`u^A(Ues{=yw7`hp8w%_4VJH#2f``QR}G&I
zzFB-<+B91GoU|KL%&-%WVh}gsXN<ugn2f*BfeD=4hS?a6HOM7Xk6W-A^RPQI4ww-R
z(m8PpbMZN5U>JAe66RpmdSe=}4&(76D&SE}z{jXSUZ4Vbhlv=rt}j^QWz6RMhFGl=
zFs6V5Mc8QBihA%cCSf;f;yzRc=TQM)Lj@2*W%>bk<40?}f(pzQ$6}a_8fT&c%tssR
zn`#a;!2wht4X6^g;AZSX1vG%nX@*e~1d(LSP1OBUcsz;<U_7Q$rgfap-WX|Bj%5LA
zol*>F;R+6v>3&SbHf+Xjynqi;kr(oliB(vR$1n|ps6g&vH9kTuFmJhlm5jez<07)r
zdagw3uU<BAf}oAt@&s;Wd<s>%AynogNGxU)b^i^VAkzm}%(#v|bz(27a_^DtW4@pg
z`--a6DsIPA2ldwtWz<s<SK=<L#XR(&dL2Y%K84z(uTYzG9(SNEC31f*YLm9261$A~
zcpVk^Yg8aJs6gfd9H<n_NOep+S4qaCqc+nX)a%raDzP6G=pZV?AtVMfhD>4ZqY`+A
zdVUrafSuLU>Jlu(ebzY8!+{p|q81)Nm3A2UGne?$zl6J}2_{hiOrze0C#XH}7WMom
zRLj00Ynvrh<_Scrw<QB7X;}rPMbZCRp4Kj1WHz<pr{!<dL@{gxE$l#Ln1*UaJ|4kF
zyn_>{N>tIWQf$K}JckPO4XT1+JcM&-H(qY0k;<q7Yq7=}pGEeG8AkQ;3aT=<EvHef
zd5Q{j2DM3NQ5Bs--M@%q$$Q6#>?<WspWoZtf2L=^*Xwr<`g)wr9UblFVEsSmy*~eG
wPye{vQ5c$x>58?NxvI)sq1dD*o2#g0Z4Qs$+2`s1JIjBrMCJ*(9W`-(0EQx?y#N3J

delta 1404
zcmYM!T}YEr9LMqh)@Hs;-BxL7W;0s|Ces?N!URhu(Lgf{g3ODcXx7yth{3>%BG4#S
zQFI}Jkq~&1QV^9`2thYR-V`NW*iH5V<wcaMzCZRrgZX*Rd7hpB%Q=sKqC?TlT+nmX
z`1J5y%XiYP(f`jruUQkr1nQYIuEdvEfFIG1pD}<rtif__dT=u`Wi42VF$`lD5-MY7
zxTt61ELPzN*5O0kfbVfPx|W-jU<WGEZY;%9s07le1ctE;N1XfP&iE15GXDY<X92y$
zw}QfahCb8}gIJCs)WXfE%-eAd9zrFMLREMfH{msB`~;QQGc3ke&iEZF!B40rFQJF{
z_LmE_$WxSWZ85H5T#HI5iacU_PzxlG<n0J*D~{no7ahP7oF(cq=0DIbnrHKl3#d5X
zQHlS=j4I7>u>wndW}O(qK|Fz~<O^2gZ;WCklNFdiC2|yZ;s7eZnBzEZXFTbQzoOzT
zA|cIFM*m6L{FEuHa5dJWTGxuIyc3CS-KgjK@H&+q$0o)u_USN2P@TJos(chx*j-eo
zrf?n3I`@D0>Ay1m#l%Kbf5Q+)?NI`CIJ;1X<}`-z66(2osKfaNRZ&gQtN|NP3HP89
z=tm`xLUrH*(geGa;esOU4(bryN4-9CsMao_67;Z&Dl0}}*?Q!bwV)F3K>a?6N+65c
z<Hy*DPo42MRNzHa+>D#F)Y1Sd!)pGh@(5~yEvN)ysJCDjYVUhd3!Fr4RT^2-&Z8>7
ziF!-M@HSgDgB6(M$2y#YEXEdP>|FlBhEWS$K?NQ`RXB<|d=GFxzQ$V^=Aft(&#@Wb
zVjO+EqdZ~<P#qk=y_iB3GUYgfZPv>_1ZSdz4dxhF0JWEOsLnJw#!y?+j!Lv2bvTo#
qmZnh84`Q~>AIT1RbJ^)Y<HUSHU!gY=*|BxoM7%uio|q1_7X1T;sC{+-

diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
index 9cff4e8..23198fc 100644
--- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
+++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.1\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2010-06-12 00:47+0200\n"
+"PO-Revision-Date: 2010-06-12 23:23+0200\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -158,7 +158,7 @@ msgid "oldpeople"
 msgstr "oldpeople"
 
 #: ddportfolioservice/controllers/ddportfolio.py:86
-#: ddportfolioservice/controllers/ddportfolio.py:92
+#: ddportfolioservice/controllers/ddportfolio.py:93
 msgid "Alioth"
 msgstr "Alioth"
 
@@ -171,54 +171,58 @@ msgid "NM"
 msgstr "NM"
 
 #: ddportfolioservice/controllers/ddportfolio.py:91
-msgid "DB"
-msgstr "DB"
+msgid "DB information via finger"
+msgstr "DB-Informationen per finger"
 
-#: ddportfolioservice/controllers/ddportfolio.py:93
+#: ddportfolioservice/controllers/ddportfolio.py:92
+msgid "DB information via HTTP"
+msgstr "DB-Informationen per HTTP"
+
+#: ddportfolioservice/controllers/ddportfolio.py:94
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ddportfolioservice/controllers/ddportfolio.py:94
+#: ddportfolioservice/controllers/ddportfolio.py:95
 msgid "Forum"
 msgstr "Forum"
 
-#: ddportfolioservice/controllers/ddportfolio.py:97
+#: ddportfolioservice/controllers/ddportfolio.py:98
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: ddportfolioservice/controllers/ddportfolio.py:98
+#: ddportfolioservice/controllers/ddportfolio.py:99
 msgid "debtags"
 msgstr "debtags"
 
-#: ddportfolioservice/controllers/ddportfolio.py:99
+#: ddportfolioservice/controllers/ddportfolio.py:100
 msgid "links"
 msgstr "Links"
 
-#: ddportfolioservice/controllers/ddportfolio.py:100
+#: ddportfolioservice/controllers/ddportfolio.py:101
 msgid "Debian website"
 msgstr "Debian Webseite"
 
-#: ddportfolioservice/controllers/ddportfolio.py:101
+#: ddportfolioservice/controllers/ddportfolio.py:102
 msgid "Debian search"
 msgstr "Debian-Suche"
 
-#: ddportfolioservice/controllers/ddportfolio.py:102
+#: ddportfolioservice/controllers/ddportfolio.py:103
 msgid "GPG public key via finger"
 msgstr "öffentlicher GPG-Schlüssel per finger"
 
-#: ddportfolioservice/controllers/ddportfolio.py:103
+#: ddportfolioservice/controllers/ddportfolio.py:104
 msgid "GPG public key via HTTP"
 msgstr "öffentlicher GPG-Schlüssel per HTTP"
 
-#: ddportfolioservice/controllers/ddportfolio.py:106
+#: ddportfolioservice/controllers/ddportfolio.py:107
 msgid "Information reachable via ssh (for DDs)"
 msgstr "Per ssh erreichbare Informationen (für DDs)"
 
-#: ddportfolioservice/controllers/ddportfolio.py:107
+#: ddportfolioservice/controllers/ddportfolio.py:108
 msgid "owned debian.net domains"
 msgstr "Besitz von debian.net-Domains"
 
-#: ddportfolioservice/controllers/ddportfolio.py:108
+#: ddportfolioservice/controllers/ddportfolio.py:109
 msgid ""
 "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
 " information"
@@ -226,15 +230,15 @@ msgstr ""
 "Informationen in der <a "
 "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
 
-#: ddportfolioservice/controllers/ddportfolio.py:109
+#: ddportfolioservice/controllers/ddportfolio.py:110
 msgid "Group membership information"
 msgstr "Information über Gruppenmitgliedschaften"
 
-#: ddportfolioservice/controllers/ddportfolio.py:112
+#: ddportfolioservice/controllers/ddportfolio.py:113
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: ddportfolioservice/controllers/ddportfolio.py:113
+#: ddportfolioservice/controllers/ddportfolio.py:114
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"
 
diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini
index 2a053fa..723462e 100644
--- a/ddportfolioservice/model/ddportfolio.ini
+++ b/ddportfolioservice/model/ddportfolio.ini
@@ -75,8 +75,11 @@ alioth.pattern=http://alioth.debian.org/~%(aliothusername)s/
 alioth.optional=true
 
 [membership]
-urls=nm,db,alioth,wiki,forum
+urls=nm,dbfinger,db,alioth,wiki,forum
 nm.pattern=https://nm.debian.org/nmstatus.php?email=%(nonddemail)s
+dbfinger.pattern=finger %(username)s@db.debian.org
+dbfinger.type=finger
+dbfinger.optional=true
 db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&amp;dosearch=Search
 db.optional=true
 alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/