Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8A98112F8 for ; Sat, 2 Aug 2014 13:50:04 +0000 (UTC) Received: (qmail 59149 invoked by uid 500); 2 Aug 2014 13:50:04 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 59115 invoked by uid 500); 2 Aug 2014 13:50:04 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 59102 invoked by uid 99); 2 Aug 2014 13:50:03 -0000 Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Aug 2014 13:50:03 +0000 Received: from reviews.apache.org (localhost [127.0.0.1]) by reviews.apache.org (Postfix) with ESMTP id 273271C03C7; Sat, 2 Aug 2014 13:49:50 +0000 (UTC) Content-Type: multipart/alternative; boundary="===============8811170417100660689==" MIME-Version: 1.0 Subject: Review Request 24204: CLOUDSTACK-7230 Pass 'noredist' as lower case in package.sh and updated cloud.spec From: "Erik Weber" To: "Hugo Trippaers" Cc: "Erik Weber" , "cloudstack" Date: Sat, 02 Aug 2014 13:49:50 -0000 Message-ID: <20140802134950.7740.91175@reviews.apache.org> X-ReviewBoard-URL: https://reviews.apache.org Auto-Submitted: auto-generated Sender: "Erik Weber" X-ReviewGroup: cloudstack X-ReviewRequest-URL: https://reviews.apache.org/r/24204/ X-Sender: "Erik Weber" Reply-To: "Erik Weber" X-ReviewRequest-Repository: cloudstack-git --===============8811170417100660689== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/24204/ ----------------------------------------------------------- Review request for cloudstack and Hugo Trippaers. Bugs: CLOUDSTACK-7230 https://issues.apache.org/jira/browse/CLOUDSTACK-7230 Repository: cloudstack-git Description ------- Steps to reproduce: 1) checkout master 2) cd packaging/centos63; ./package.sh -p noredist 3) verify that cloudstack-mysql-ha rpm is not created Currently package/centos63/package.sh claims that you can pass '-p noredist|NOREDIST' to build the noredist packages. The value you pass it, will be reused later in the function packaging due to this line: DEFOSSNOSS="-D_ossnoss $packageval" $packageval is set to the input parameter earlier before being passed to the packaging function. This means, that if you execute package.sh with the parameter '-p noredist', then rpmbuild will receive it as lower case, but if you execute it with parameter '-p NOREDIST' rpmbuild will receive it as 'NOREDIST'. There are a couple of if statements in the cloud.spec that checks for 'NOREDIST' or 'noredist', but the introduction of the mysql-ha package only checks for 'NOREDIST', meaning that if you pass it as 'noredist' you will not get the mysql-ha package built. I changed package.sh to send the parameter to rpmbuild as lower case, but package.sh still allows to be passed both. I also changed the upper case only if's in cloud.spec for mysql-ha, to lower case so that they suit the new package.sh script. There is a tradeoff here, anyone that does packaging any other way than using package.sh might have to change to passing 'NOREDIST' as lower case. For the future we might consider if the cloud.spec should handle lower casing the parameter, if possible. I haven't checked into that possibility yet. If you want me to rather change the cloud.spec to check for both upper and lower case, let me know and I'll update the patch. Diffs ----- packaging/centos63/cloud.spec 1d4d061 packaging/centos63/package.sh 07f95fc Diff: https://reviews.apache.org/r/24204/diff/ Testing ------- Verified that noredist packages, including mysql-ha, gets built when passing either 'NOREDIST' or 'noredist' as parameter to package.sh File Attachments ---------------- CLOUDSTACK-7230 https://reviews.apache.org/media/uploaded/files/2014/08/02/6d5e4454-3f75-454c-8688-e3314acbc043__CLOUDSTACK-7230.patch Thanks, Erik Weber --===============8811170417100660689==--