[CalendarServer-changes] [10970] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 30 01:57:47 PDT 2013
Revision: 10970
http://trac.calendarserver.org//changeset/10970
Author: dre at apple.com
Date: 2013-03-30 01:57:47 -0700 (Sat, 30 Mar 2013)
Log Message:
-----------
Typo fix in cpu detection for FreeBSD
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tap/caldav.py
CalendarServer/trunk/support/build.sh
Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py 2013-03-27 20:20:55 UTC (rev 10969)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2013-03-30 08:57:47 UTC (rev 10970)
@@ -634,15 +634,18 @@
self.log_info("%s %s starting %s process..." % (self.description, version, config.ProcessType))
try:
- from setproctitle import setproctitle
+ from setproctitle import setproctitle, getproctitle
except ImportError:
pass
else:
+ origTitle = getproctitle()
if config.LogID:
logID = " #%s" % (config.LogID,)
else:
logID = ""
- setproctitle("CalendarServer %s [%s%s]" % (version, config.ProcessType, logID))
+ if config.ProcessType is not "Utility":
+ origTitle = ""
+ setproctitle("CalendarServer %s [%s%s] %s" % (version, config.ProcessType, logID, origTitle))
serviceMethod = getattr(self, "makeService_%s" % (config.ProcessType,), None)
Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh 2013-03-27 20:20:55 UTC (rev 10969)
+++ CalendarServer/trunk/support/build.sh 2013-03-30 08:57:47 UTC (rev 10970)
@@ -552,7 +552,7 @@
;;
FreeBSD)
ncpu="$(sysctl hw.ncpu)";
- ncpu="${cpu##hw.ncpu: }";
+ ncpu="${ncpu##hw.ncpu: }";
;;
esac;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130330/1d818774/attachment.html>
More information about the calendarserver-changes
mailing list