From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C691E1381F3 for ; Thu, 25 Apr 2013 16:44:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CB10E0B80; Thu, 25 Apr 2013 16:44:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9130E0B80 for ; Thu, 25 Apr 2013 16:44:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAD8633DF60 for ; Thu, 25 Apr 2013 16:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 52E86E441B for ; Thu, 25 Apr 2013 16:44:20 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1366902480.b933346697353a11d83c0d7fa955d149d52f5b5a.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/ebuild/creation.py X-VCS-Directories: roverlay/ebuild/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: b933346697353a11d83c0d7fa955d149d52f5b5a X-VCS-Branch: master Date: Thu, 25 Apr 2013 16:44:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 244ef985-ace9-469d-9797-9e258ca61121 X-Archives-Hash: 3a59fbfa47cef582c981777b0d7f42d8 commit: b933346697353a11d83c0d7fa955d149d52f5b5a Author: André Erdmann mailerd de> AuthorDate: Thu Apr 25 15:08:00 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Apr 25 15:08:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b9333466 ebuild/creation: dont add an empty DESCRIPTION var --- roverlay/ebuild/creation.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/roverlay/ebuild/creation.py b/roverlay/ebuild/creation.py index 6494a4c..42977ab 100644 --- a/roverlay/ebuild/creation.py +++ b/roverlay/ebuild/creation.py @@ -92,20 +92,22 @@ class EbuildCreation ( object ): description = desc ['Title'] if 'Description' in desc: - if description is None: - description = desc ['Description'] - else: + if description: description += '// ' + desc ['Description'] + else: + description = desc ['Description'] + else: # use either Title or Description for DESCRIPTION= # (Title preferred 'cause it should be shorter) if 'Title' in desc: description = desc ['Title'] - elif 'Description' in desc: + + if not description and 'Description' in desc: description = desc ['Description'] - if description is not None: + if description: return evars.DESCRIPTION ( description ) elif FALLBACK_DESCRIPTION: return evars.DESCRIPTION ( FALLBACK_DESCRIPTION )