Revision: 3621 http://trac.macosforge.org/projects/calendarserver/changeset/3621 Author: sagen@apple.com Date: 2009-01-28 16:20:08 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Fix the no-merge_flags case (only running submit -b without -i) Modified Paths: -------------- CalendarServer/trunk/support/submit Modified: CalendarServer/trunk/support/submit =================================================================== --- CalendarServer/trunk/support/submit 2009-01-28 23:17:49 UTC (rev 3620) +++ CalendarServer/trunk/support/submit 2009-01-29 00:20:08 UTC (rev 3621) @@ -167,6 +167,8 @@ merge_flags="-merge \"${package_tmp}\""; elif "${install}"; then merge_flags="-merge /"; + else + merge_flags=""; fi; sudo ~rc/bin/buildit "${wc}" CALENDARSERVER_CACHE_DEPS="${CALENDARSERVER_CACHE_DEPS-${wd}/.dependencies}" \