diff options
| author | schmonz <schmonz> | 2011-02-12 14:11:42 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2011-02-12 14:11:42 +0000 |
| commit | a7a0b92a9cc4d8ac986cb0df65283b9d40fbd53b (patch) | |
| tree | 5e85d03c10c1c9a5d2de848ded27a50d437370c2 /mail | |
| parent | 75f61304e15ceb49d60871f55e98eccc8fad0c98 (diff) | |
| download | pkgsrc-a7a0b92a9cc4d8ac986cb0df65283b9d40fbd53b.tar.gz | |
Fix not-really-a-parse-error when OVERRIDE_EMAIL and DEFAULT_EMAIL
aren't set to anything fancy. Bump PKGREVISION.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/rss2email/Makefile | 3 | ||||
| -rw-r--r-- | mail/rss2email/distinfo | 4 | ||||
| -rw-r--r-- | mail/rss2email/patches/patch-ad | 20 |
3 files changed, 23 insertions, 4 deletions
diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile index 56154045905..2360dc2c98b 100644 --- a/mail/rss2email/Makefile +++ b/mail/rss2email/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2011/01/28 01:41:52 schmonz Exp $ +# $NetBSD: Makefile,v 1.26 2011/02/12 14:11:42 schmonz Exp $ # DISTNAME= rss2email-2.70 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE} diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo index ada7e28cb9c..1f64e027057 100644 --- a/mail/rss2email/distinfo +++ b/mail/rss2email/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2011/01/28 01:41:52 schmonz Exp $ +$NetBSD: distinfo,v 1.19 2011/02/12 14:11:42 schmonz Exp $ SHA1 (rss2email-2.70.tar.gz) = 8f59e33e38b0a01a9ce411b82b31708604228c37 RMD160 (rss2email-2.70.tar.gz) = d5d7a06c33d51c21784c069c27fb52ab87665b06 Size (rss2email-2.70.tar.gz) = 57961 bytes SHA1 (patch-aa) = a19bb5795e7fcbfc8e03f86c25646b091052794b SHA1 (patch-ab) = db8f4780a40f1231782e7391c7d7b03c011a8534 -SHA1 (patch-ad) = d76be79ebd5886d75f885fe96d0d9d8b1720c243 +SHA1 (patch-ad) = c50bde2a97ac5787aa4d9dd78964bbb647c919c9 diff --git a/mail/rss2email/patches/patch-ad b/mail/rss2email/patches/patch-ad index ecb6fe88f97..cb033884a40 100644 --- a/mail/rss2email/patches/patch-ad +++ b/mail/rss2email/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.7 2011/01/28 01:41:53 schmonz Exp $ +$NetBSD: patch-ad,v 1.8 2011/02/12 14:11:42 schmonz Exp $ --- rss2email.py.orig 2010-12-17 18:29:34.000000000 +0000 +++ rss2email.py @@ -10,3 +10,21 @@ $NetBSD: patch-ad,v 1.7 2011/01/28 01:41:53 schmonz Exp $ import html2text as h2t h2t.UNICODE_SNOB = UNICODE_SNOB +@@ -446,7 +447,7 @@ def getEmail(r, entry): + + if FORCE_FROM: return DEFAULT_FROM + +- if r.url in OVERRIDE_EMAIL.keys(): ++ if hasattr(r, "url") and r.url in OVERRIDE_EMAIL.keys(): + return validateEmail(OVERRIDE_EMAIL[r.url], DEFAULT_FROM) + + if 'email' in entry.get('author_detail', []): +@@ -462,7 +463,7 @@ def getEmail(r, entry): + if feed.get("errorreportsto", ''): + return validateEmail(feed.errorreportsto, DEFAULT_FROM) + +- if r.url in DEFAULT_EMAIL.keys(): ++ if hasattr(r, "url") and r.url in DEFAULT_EMAIL.keys(): + return DEFAULT_EMAIL[r.url] + return DEFAULT_FROM + |