Bug#636918: Patch to fetch additional text
Hi,
attached is a patch (based on dailystrips-1.0.28-11) that implements
this functionality.
It introduces an additional keyword altpattern. This is a regular
expression whose match (the part in parentheses) is written to the
HTML file generated by dailystrips. altpattern only works for strips
of type search right now, since dailystrips downloads the comic's
webpage only in that case.
This is the xkcd definition I use to extract the tooltip text:
strip xkcd
name xkcd
homepage http://xkcd.com/
type search
baseurl http://imgs.xkcd.com
searchpage http://xkcd.com/
searchpattern img src=http://imgs.xkcd.com(/comics/.+?\.(png|jpg))
altpattern img src=http://imgs.xkcd.com/comics/.+?; title=(.+?)
provides latest
end
Wolfgang
--- dailystrips~ 2013-05-04 14:21:49.309233266 +0200
+++ dailystrips 2013-05-04 14:44:49.149175238 +0200
@@ -531,7 +531,7 @@
if ($options{'stripnav'}) {
print font face=\helvetica\Strips:/fontbr\n;
for (@strips) {
- my ($strip, $name) = (split(/;/, $_))[0,1];
+ my ($strip, $name) = $$_[0,1];
print a href=\#$strip\$name/Anbsp;nbsp;;
}
print \nbrbr;
@@ -550,12 +550,12 @@
}
for (@strips) {
- my ($strip, $name, $homepage, $img_addr, $referer, $prefetch, $artist) = split(/;/, $_);
+ my ($strip, $name, $homepage, $img_addr, $referer, $prefetch, $artist, $alt) = @$_;
my ($img_line, $local_name, $local_name_dir, $local_name_file, $local_name_ext, $image, $ext,
$local_name_yesterday, $local_name_yesterday_dir, $local_name_yesterday_file, $local_name_yesterday_ext);
if ($options{'verbose'} and $options{'local'}) {
- warn Downloading strip file for . lc((split(/;/, $_))[0]) . \n;
+ warn Downloading strip file for . lc($strip) . \n;
}
if ($img_addr =~ ^unavail) {
@@ -791,6 +791,11 @@
/tr
tr
td
+ $alt
+ /td
+ /tr
+ tr
+ td
$img_line
pnbsp;/p
/td
@@ -896,7 +901,7 @@
sub get_strip {
my ($strip) = @_;
- my ($page, $addr);
+ my ($page, $addr, $alt, @row);
if ($options{'date'} and $defs{$strip}{'provides'} eq latest) {
if ($options{'verbose'}) {
@@ -940,6 +945,9 @@
$addr = $defs{$strip}{'baseurl'} . $match . $defs{$strip}{'urlsuffix'};
}
}
+
+$page =~ /$defs{$strip}{'altpattern'}/si;
+$alt = ${1};
}
} elsif ($defs{$strip}{'type'} eq generate) {
@@ -947,8 +955,9 @@
}
unless ($addr =~ /^(https?:\/\/|unavail)/io) { $addr = http://; . $addr }
-
- push(@strips,$strip;$defs{$strip}{'name'};$defs{$strip}{'homepage'};$addr;$defs{$strip}{'referer'};$defs{$strip}{'prefetch'};$defs{$strip}{'artist'});
+
+@row = ($strip, $defs{$strip}{'name'}, $defs{$strip}{'homepage'}, $addr, $defs{$strip}{'referer'}, $defs{$strip}{'prefetch'}, $defs{$strip}{'artist'}, $alt);
+ push(@strips, \@row);
}
sub get_defs {
@@ -1230,6 +1239,10 @@
{
$defs{$strip}{'searchpattern'} = $1;
}
+ elsif (/^altpattern\s+(.+)$/i)
+ {
+$defs{$strip}{'altpattern'} = $1;
+ }
elsif (/^matchpart\s+(.+)$/i)
{
unless ($1 =~ /^(\d+)$/) {
signature.asc
Description: Digital signature
Bug#487510: python-pam: Example code is incorrect
Package: python-pam
Version: 0.4.2-10.4
Severity: normal
Tags: patch
The example code examples/pamtest.py is incorrect, it references the
non-existent constants PAM.PAM_PROMPT_ERROR_MSG and PAM.PAM_PROMPT_TEXT_INFO.
The correct names are PAM_ERROR_MSG and PAM_TEXT_INFO, respectively (without
PROMPT).
While this does not affect the example itself (the if-branch in question never
runs), it causes hard to detect errors in application code that relies on this
wrong example. This conversation function seems to somehow run in a plain-C
context, so the usual Python error, 'module' object has no attribute 'foo'
will not propagate to the user -- who is left scratching his head about
inscrutable PAM conversation errors.
Since this example file effectively is the only documentation available on the
python-pam module, it would be nice if it were correct. ;-)
The attached patch to fix the documentation is of course trivial, but
might potentially save a lot of bug-hunting.
-- System Information:
Debian Release: 4.0
APT prefers stable
APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.9-023stab044.16-enterprise
Locale: LANG=C, [EMAIL PROTECTED] (charmap=ISO-8859-15)
Versions of packages python-pam depends on:
ii python2.4.4-2An interactive high-level object-o
python-pam recommends no packages.
-- no debconf information
--- examples/pamtest.py~ 23:08:48.0 +0100
+++ examples/pamtest.py 2008-06-22 12:09:03.0 +0200
@@ -16,7 +16,7 @@
elif type == PAM.PAM_PROMPT_ECHO_OFF:
val = getpass(query)
resp.append((val, 0))
- elif type == PAM.PAM_PROMPT_ERROR_MSG or type ==
PAM.PAM_PROMPT_TEXT_INFO:
+ elif type == PAM.PAM_ERROR_MSG or type == PAM.PAM_TEXT_INFO:
print query
resp.append(('', 0))
else:
Bug#352093: Reproduction recipe
Steps to reproduce: Into a virgin Jetty install (I just said apt-get install jetty), add a webapp like so Call name=addWebApplication Argsome.vhost.name/Arg Arg//Arg Arg/path/to/webapp/Arg /Call place this in /path/to/webapp/index.jsp: JSP says: %= Hello world % presto, NoClassDefFoundError: 08:16:20.774 WARN!! [SocketListener0-9] org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:589) 11 /: java.lang.NoClassDefFoundError: org/apache/commons/el/ExpressionEvaluatorImpl at org.apache.jasper.compiler.JspUtil.clinit(JspUtil.java:62) at org.apache.jasper.JspCompilationContext.getServletClassName(JspCompilationContext.java:293) at org.apache.jasper.JspCompilationContext.getClassFileName(JspCompilationContext.java:433) which promptly disappears after adding the class to /etc/jetty/start.config as described by Daniel above. Please do tell if I can provide any more information to debug this problem. Wolfgang -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#368600: xscreensaver: entering password fails
Package: xscreensaver Version: 4.24-4 Severity: normal The password prompt does not accept any keystrokes (no * displayed, nothing), and if I press return, checks (and rejects ;-) an empty password. The countdown bar to the left is refilled with each stroke, though. I'm rather confused about this. let me know if I can do anything to help, Wolfgang -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (650, 'testing'), (600, 'unstable'), (500, 'experimental'), (500, 'stable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.15-1-686 Locale: LANG=C, [EMAIL PROTECTED] (charmap=ISO-8859-15) Versions of packages xscreensaver depends on: ii libatk1.0-0 1.11.4-2 The ATK accessibility toolkit ii libc6 2.3.6-7GNU C Library: Shared libraries ii libcairo2 1.0.4-2The Cairo 2D vector graphics libra ii libfontconfig12.3.2-5.1 generic font configuration library ii libglade2-0 1:2.5.1-2 library to load .glade files at ru ii libglib2.0-0 2.10.2-1 The GLib library of C routines ii libgtk2.0-0 2.8.16-1 The GTK+ graphical user interface ii libice6 6.9.0.dfsg.1-6 Inter-Client Exchange library ii libjpeg62 6b-13 The Independent JPEG Group's JPEG ii libpam0g 0.79-3.1 Pluggable Authentication Modules l ii libpango1.0-0 1.12.1-2 Layout and rendering of internatio ii libsm66.9.0.dfsg.1-6 X Window System Session Management ii libx11-6 6.9.0.dfsg.1-6 X Window System protocol client li ii libxcursor1 1.1.3-1X cursor management library ii libxext6 6.9.0.dfsg.1-6 X Window System miscellaneous exte ii libxfixes36.9.0.dfsg.1-6 X Window System miscellaneous 'fix ii libxi66.9.0.dfsg.1-6 X Window System Input extension li ii libxinerama1 6.9.0.dfsg.1-6 X Window System multi-head display ii libxml2 2.6.24.dfsg-1 GNOME XML library ii libxmu6 6.9.0.dfsg.1-6 X Window System miscellaneous util ii libxpm4 6.9.0.dfsg.1-6 X pixmap library ii libxrandr26.9.0.dfsg.1-6 X Window System Resize, Rotate and ii libxrender1 1:0.9.0.2-1X Rendering Extension client libra ii libxt66.9.0.dfsg.1-6 X Toolkit Intrinsics ii libxxf86misc1 6.9.0.dfsg.1-6 X miscellaneous extensions library ii libxxf86vm1 6.9.0.dfsg.1-6 X Video Mode selection library ii zlib1g1:1.2.3-11 compression library - runtime Versions of packages xscreensaver recommends: ii libjpeg-progs 6b-13 Programs for manipulating JPEG fil ii perl [perl5] 5.8.8-4Larry Wall's Practical Extraction ii wamerican [wordlist] 6-2American English dictionary words ii wbritish [wordlist] 6-2British English dictionary words f ii xli 1.17.0-22 command line tool for viewing imag -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#349305: solution for kernel oops found
* Gasper Zejn [EMAIL PROTECTED] [2006-02-06 14:19]: diff -ur sl-modem-2.9.9d+e-pre2.original/drivers/amrmo_init.c -#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, dev, device, fmt, rest) +#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, NULL, dev, device, fmt, rest) I can confirm both the Oops at boot time as well as the fact that the above patch fixed the problem for me. I'm on a Thinkpad R50p, short system info is below. Wolfgang nautis:~# uname -a Linux nautis 2.6.15-1-686 #1 Wed Jan 18 15:04:35 UTC 2006 i686 GNU/Linux nautis:~# lspci -v | less [snip] :00:1f.6 Modem: Intel Corporation 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (rev 01) (prog-if 00 [Generic]) Subsystem: IBM: Unknown device 0525 Flags: bus master, medium devsel, latency 0, IRQ 11 I/O ports at 2400 [size=256] I/O ports at 2000 [size=128] Capabilities: [50] Power Management version 2 [snap] nautis:~# dpkg-query --list sl-modem* ii sl-modem-daemon2.9.9d+e-pre2-2SmartLink software modem daemon ii sl-modem-modules-2 2.9.9d+e-pre2-2+10 Smart Link modem modules for Linux (kernel 2.6.15-1-686) ii sl-modem-source2.9.9d+e-pre2-2SmartLink software modem driver - module building source -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
