diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 20:42:24 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 20:42:24 -0500 |
commit | 60f9b3fe60d5e5b6049ef71d1dfb25dade4fd6a3 (patch) | |
tree | b8637d22e57f16f9b6bf5a539bdde7a99ac5189b | |
parent | b002d67a39163bffe51bc3b4a49adf15be8d7d92 (diff) | |
parent | b79d9b0eeb936dd73b2724033f69189a851227e7 (diff) |
Merge branch 'master' into phonyjs
Conflicts:
media/Makefile
-rw-r--r-- | devel/management/commands/reporead.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index c444538b..bb7d1005 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -197,7 +197,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 |