[aur-dev] [PATCH v2 2/2] Make url and pkgdesc fields optional

[Johannes Löthberg]

The url and pkgdesc PKGBUILD variables are optional, so should be in the
AUR as well.

Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
 git-interface/git-update.py  | 8 ++++++--
 web/template/pkg_details.php | 8 ++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/git-interface/git-update.py b/git-interface/git-update.py
index 6610019..b9f960f 100755
--- a/git-interface/git-update.py
+++ b/git-interface/git-update.py
@@ -247,10 +247,14 @@ for commit in walker:
     for pkgname in srcinfo.GetPackageNames():
         pkginfo = srcinfo.GetMergedPackage(pkgname)
 
-        for field in ('pkgver', 'pkgrel', 'pkgname', 'pkgdesc', 'url'):
+        for field in ('pkgver', 'pkgrel', 'pkgname'):
             if not field in pkginfo:
                 die_commit('missing mandatory field: %s' % (field), commit.id)
 
+        for field in ('pkgdesc', 'url'):
+            if not field in pkginfo:
+                pkginfo[field] = 'NULL'
+
         if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit():
             die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id)
 
@@ -259,7 +263,7 @@ for commit in walker:
                        commit.id)
 
         for field in ('pkgname', 'pkgdesc', 'url'):
-            if len(pkginfo[field]) > 255:
+            if field in pkginfo and len(pkginfo[field]) > 255:
                 die_commit('%s field too long: %s' % (field, pkginfo[field]),
                            commit.id)
 
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 2f121e7..963504d 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -183,11 +183,19 @@ $sources = pkg_sources($row["ID"]);
 		</tr>
 		<tr>
 			<th><?= __('Description') . ': ' ?></th>
+<?php if ($row['Description'] != 'NULL'): ?>
 			<td class="wrap"><?= htmlspecialchars($row['Description']); ?></td>
+<?php else: ?>
+			<td class="wrap"><?= __('None') ?></td>
+<?php endif; ?>
 		</tr>
 		<tr>
 			<th><?= __('Upstream URL') . ': ' ?></th>
+<?php if ($row['URL'] != 'NULL'): ?>
 			<td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td>
+<?php else: ?>
+			<td class="wrap"><?= __('None') ?></td>
+<?php endif; ?>
 		</tr>
 <?php
 if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0):
-- 
2.4.3