Skip to content

Commit ad2bcc0

Browse files
committed
Merge pull request #1114 from davidamorimfaria/4.6
CLOUDSTACK-9065: fix bug when creating packaging with noredist flagFixes this: ``` $ bash -x package.sh -p noredist -d centos63 (...) + rpmbuild --define '_topdir /home/david/cloudstack/packaging/../dist/rpmbuild' '-D_ver 4.6.1' '-D_rel SNAPSHOT' '-D_prerelease 1' -D_ossnoss noredist -bb SPECS/cloud.spec error: Macro %_ossnoss has empty body error: Macro %_ossnoss has empty body error: failed to stat /home/david/cloudstack/dist/rpmbuild/noredist: No such file or directory + '[' 1 -ne 0 ']' + echo 'RPM Build Failed ' RPM Build Failed + exit 3 ``` It was missing quotes around the rpmbuild argument '-D_ossnoss noredist'. * pr/1114: CLOUDSTACK-9065: fix bug when creating packaging with noredist flag Signed-off-by: Daan Hoogland <[email protected]>
2 parents ab385c8 + adb0d3b commit ad2bcc0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

packaging/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function packaging() {
102102
echo ". executing rpmbuild"
103103
cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS"
104104

105-
(cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+$DEFOSSNOSS} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
105+
(cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
106106
if [ $? -ne 0 ]; then
107107
echo "RPM Build Failed "
108108
exit 3

0 commit comments

Comments
 (0)