summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/management/commands/reporead.py7
-rw-r--r--devel/views.py4
2 files changed, 8 insertions, 3 deletions
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index cc536b15..4dd26091 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -103,6 +103,8 @@ class Pkg(object):
setattr(self, k, long(v[0]))
elif k in ('desc', 'pgpsig'):
# do NOT prune these values at all
+ if v[0] == None:
+ v[0] = 'missing'
setattr(self, k, v[0])
elif k == 'version':
match = self.version_re.match(v[0])
@@ -197,7 +199,10 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None):
dbpkg.pkgver = repopkg.ver
dbpkg.pkgrel = repopkg.rel
dbpkg.epoch = repopkg.epoch
- dbpkg.pkgdesc = repopkg.desc
+ try:
+ dbpkg.pkgdesc = repopkg.desc
+ except AttributeError:
+ dbpkg.pkgdesc = "missing"
dbpkg.url = repopkg.url
dbpkg.filename = repopkg.filename
dbpkg.compressed_size = repopkg.csize
diff --git a/devel/views.py b/devel/views.py
index 79272c98..f7ed3539 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -294,9 +294,9 @@ class NewUserForm(forms.ModelForm):
'password': password,
})
- send_mail("Your new archweb account",
+ send_mail("Your new parabolaweb account",
template.render(ctx),
- 'Arch Website Notification <nobody@archlinux.org>',
+ 'Parabola <dev@lists.parabolagnulinux.org>',
[user.email],
fail_silently=False)