April 2014 - calendarserver-changes

[13387] CalendarServer/trunk/support/Apple.make
by source_changes＠macosforge.org 30 Apr '14

30 Apr '14

Revision: 13387 http://trac.calendarserver.org//changeset/13387 Author: wsanchez(a)apple.com Date: 2014-04-30 15:09:08 -0700 (Wed, 30 Apr 2014) Log Message: ----------- Get PYTHONPATH right when bootstrapping. Modified Paths: -------------- CalendarServer/trunk/support/Apple.make Modified: CalendarServer/trunk/support/Apple.make =================================================================== --- CalendarServer/trunk/support/Apple.make 2014-04-30 22:08:49 UTC (rev 13386) +++ CalendarServer/trunk/support/Apple.make 2014-04-30 22:09:08 UTC (rev 13387) @@ -102,7 +102,7 @@ @# @echo "Installing Python packages..."; $(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \ - $(Environment) PYTHONPATH="$(BuildDirectory)/pytools/lib" \ + $(Environment) \ "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \ --pre --allow-all-external --no-index --no-deps \ --log=/tmp/pip.log \ @@ -112,7 +112,8 @@ @# Make the virtualenv relocatable @# @echo "Making virtual environment relocatable..."; - $(PYTHON) -m virtualenv --relocatable "$(DSTROOT)$(CS_VIRTUALENV)"; + PYTHONPATH="$(BuildDirectory)/pytools/lib" \ + $(PYTHON) -m virtualenv --relocatable "$(DSTROOT)$(CS_VIRTUALENV)"; @# @# Clean up @#

1 0

[13386] CalendarServer/trunk/bin/_build.sh
by source_changes＠macosforge.org 30 Apr '14

30 Apr '14

Revision: 13386 http://trac.calendarserver.org//changeset/13386 Author: wsanchez(a)apple.com Date: 2014-04-30 15:08:49 -0700 (Wed, 30 Apr 2014) Log Message: ----------- Set python/PYTHON to bootstrap_python initially, then to the ve python in py_dependencies. Modified Paths: -------------- CalendarServer/trunk/bin/_build.sh Modified: CalendarServer/trunk/bin/_build.sh =================================================================== --- CalendarServer/trunk/bin/_build.sh 2014-04-30 19:22:22 UTC (rev 13385) +++ CalendarServer/trunk/bin/_build.sh 2014-04-30 22:08:49 UTC (rev 13386) @@ -90,7 +90,7 @@ py_virtualenv="${dev_home}/virtualenv"; py_bindir="${py_virtualenv}/bin"; - python="${py_bindir}/python"; + python="${bootstrap_python}"; export PYTHON="${python}"; if [ -z "${TWEXT_PKG_CACHE-}" ]; then @@ -99,10 +99,6 @@ dep_packages="${TWEXT_PKG_CACHE}"; fi; - if [ ! -d "${py_virtualenv}" ]; then - "${bootstrap_python}" -m virtualenv --system-site-packages "${py_virtualenv}"; - fi; - project="$(setup_print name)"; export _DEVELOP_PROJECT_="${project}"; @@ -154,7 +150,7 @@ setup_print () { what="$1"; shift; - PYTHONPATH="${wd}:${PYTHONPATH:-}" "${python}" - << EOF + PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - << EOF from __future__ import print_function import setup print(setup.${what}) @@ -589,14 +585,17 @@ # Build Python dependencies # py_dependencies () { + python="${py_bindir}/python"; + export PATH="${py_virtualenv}/bin:${PATH}"; + export PYTHON="${python}"; export PYTHONPATH="${wd}:${PYTHONPATH:-}"; # Work around a change in Xcode tools that breaks Python modules in OS X # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as # it was in the system Python, and is therefore passed along by disutils. if [ "$(uname -s)" = "Darwin" ]; then - if "${python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \ + if "${bootstrap_python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \ | grep -e -mno-fused-madd > /dev/null; then export ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future"; fi;

1 0

[13385] CalendarServer/trunk/txdav/who/directory.py
by source_changes＠macosforge.org 30 Apr '14

30 Apr '14

Revision: 13385 http://trac.calendarserver.org//changeset/13385 Author: sagen(a)apple.com Date: 2014-04-30 12:22:22 -0700 (Wed, 30 Apr 2014) Log Message: ----------- Deal with missing fullNames Modified Paths: -------------- CalendarServer/trunk/txdav/who/directory.py Modified: CalendarServer/trunk/txdav/who/directory.py =================================================================== --- CalendarServer/trunk/txdav/who/directory.py 2014-04-30 00:02:34 UTC (rev 13384) +++ CalendarServer/trunk/txdav/who/directory.py 2014-04-30 19:22:22 UTC (rev 13385) @@ -332,7 +332,10 @@ @property def displayName(self): - return self.fullNames[0] + try: + return self.fullNames[0] + except AttributeError: + return u"" def cacheToken(self): @@ -513,11 +516,11 @@ if "PARTSTAT" not in params: params["PARTSTAT"] = "NEEDS-ACTION" if "CN"not in params: - if self.fullNames: - params["CN"] = list(self.fullNames)[0] + if self.displayName: + params["CN"] = self.displayName.encode("utf-8") if "EMAIL" not in params: - if self.emailAddresses: - params["EMAIL"] = list(self.emailAddresses)[0] + if hasattr(self, "emailAddresses"): + params["EMAIL"] = list(self.emailAddresses)[0].encode("utf-8") if "CUTYPE" not in params: cuType = self.getCUType() if cuType is not "INDIVIDUAL":

1 0

[13384] CalendarServer/trunk/support/submit
by source_changes＠macosforge.org 30 Apr '14

30 Apr '14

Revision: 13384 http://trac.calendarserver.org//changeset/13384 Author: wsanchez(a)apple.com Date: 2014-04-29 17:02:34 -0700 (Tue, 29 Apr 2014) Log Message: ----------- remove tmp file Modified Paths: -------------- CalendarServer/trunk/support/submit Modified: CalendarServer/trunk/support/submit =================================================================== --- CalendarServer/trunk/support/submit 2014-04-30 00:01:42 UTC (rev 13383) +++ CalendarServer/trunk/support/submit 2014-04-30 00:02:34 UTC (rev 13384) @@ -202,6 +202,7 @@ package_file="${project_version}.tgz"; echo "Creating package: ${package_file}..."; tar -C "${package_tmp}" -cvzf "${package_file}" .; + rm -rf "${package_tmp}"; if "${install}"; then echo "Installing package: ${package_file}"; tar -C / -xvzf "${package_file}";

1 0

[13383] CalendarServer/trunk/support/Apple.make
by source_changes＠macosforge.org 30 Apr '14

30 Apr '14

Revision: 13383 http://trac.calendarserver.org//changeset/13383 Author: wsanchez(a)apple.com Date: 2014-04-29 17:01:42 -0700 (Tue, 29 Apr 2014) Log Message: ----------- Set PYTHONPATH when creating ve. Modified Paths: -------------- CalendarServer/trunk/support/Apple.make Modified: CalendarServer/trunk/support/Apple.make =================================================================== --- CalendarServer/trunk/support/Apple.make 2014-04-29 22:00:37 UTC (rev 13382) +++ CalendarServer/trunk/support/Apple.make 2014-04-30 00:01:42 UTC (rev 13383) @@ -77,16 +77,16 @@ $(_v) mkdir -p "$(BuildDirectory)/pytools/lib"; $(_v) mkdir -p "$(BuildDirectory)/pytools/junk"; $(_v) for pkg in $$(find "$(Sources)/.develop/tools" -type f -name "*.tgz"); do \ - tar -C "$(BuildDirectory)" -xvzf "$${pkg}"; \ - cd "$(BuildDirectory)/$$(basename "$${pkg}" .tgz)" && \ - PYTHONPATH="$(BuildDirectory)/pytools/lib" \ - "$(PYTHON)" setup.py install \ - --install-base="$(BuildDirectory)/pytools" \ - --install-lib="$(BuildDirectory)/pytools/lib" \ - --install-headers="$(BuildDirectory)/pytools/junk" \ - --install-scripts="$(BuildDirectory)/pytools/junk" \ - --install-data="$(BuildDirectory)/pytools/junk" \ - ; \ + tar -C "$(BuildDirectory)" -xvzf "$${pkg}"; \ + cd "$(BuildDirectory)/$$(basename "$${pkg}" .tgz)" && \ + PYTHONPATH="$(BuildDirectory)/pytools/lib" \ + "$(PYTHON)" setup.py install \ + --install-base="$(BuildDirectory)/pytools" \ + --install-lib="$(BuildDirectory)/pytools/lib" \ + --install-headers="$(BuildDirectory)/pytools/junk" \ + --install-scripts="$(BuildDirectory)/pytools/junk" \ + --install-data="$(BuildDirectory)/pytools/junk" \ + ; \ done; @# @# Set up a virtual environment in Server.app; we'll install into that. @@ -102,10 +102,11 @@ @# @echo "Installing Python packages..."; $(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \ - $(Environment) "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \ - --pre --allow-all-external --no-index --no-deps \ - --log=/tmp/pip.log \ - "$${pkg}"; \ + $(Environment) PYTHONPATH="$(BuildDirectory)/pytools/lib" \ + "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \ + --pre --allow-all-external --no-index --no-deps \ + --log=/tmp/pip.log \ + "$${pkg}"; \ done; @# @# Make the virtualenv relocatable

1 0

[13382] PyKerberos/trunk/support/PyKerberos.xcodeproj/project.pbxproj
by source_changes＠macosforge.org 29 Apr '14

29 Apr '14

Revision: 13382 http://trac.calendarserver.org//changeset/13382 Author: gaya(a)apple.com Date: 2014-04-29 15:00:37 -0700 (Tue, 29 Apr 2014) Log Message: ----------- make buildable using current OS Modified Paths: -------------- PyKerberos/trunk/support/PyKerberos.xcodeproj/project.pbxproj Modified: PyKerberos/trunk/support/PyKerberos.xcodeproj/project.pbxproj =================================================================== --- PyKerberos/trunk/support/PyKerberos.xcodeproj/project.pbxproj 2014-04-29 16:28:05 UTC (rev 13381) +++ PyKerberos/trunk/support/PyKerberos.xcodeproj/project.pbxproj 2014-04-29 22:00:37 UTC (rev 13382) @@ -117,9 +117,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD76F620486A84900D96B5E /* PyKerberos */ = { + 8DD76F620486A84900D96B5E /* kerberos.so */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "PyKerberos" */; + buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "kerberos.so" */; buildPhases = ( 8DD76F640486A84900D96B5E /* Sources */, 8DD76F660486A84900D96B5E /* Frameworks */, @@ -129,7 +129,7 @@ ); dependencies = ( ); - name = PyKerberos; + name = kerberos.so; productInstallPath = "$(HOME)/bin"; productName = PyKerberos; productReference = 8DD76F6C0486A84900D96B5E /* PyKerberos */; @@ -140,14 +140,20 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "PyKerberos" */; compatibilityVersion = "Xcode 3.0"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + en, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* PyKerberos */; projectDirPath = ""; projectRoot = ""; targets = ( - 8DD76F620486A84900D96B5E /* PyKerberos */, + 8DD76F620486A84900D96B5E /* kerberos.so */, ); }; /* End PBXProject section */ @@ -183,7 +189,9 @@ ); HEADER_SEARCH_PATHS = "/System/Library/Frameworks/Python.framework/Headers/**"; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = PyKerberos; + PRODUCT_NAME = kerberos.so; + SDKROOT = ""; + SYMROOT = /Volumes/scalawag/Users/gaya/xbuild; ZERO_LINK = YES; }; name = Debug; @@ -199,7 +207,9 @@ GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = "/System/Library/Frameworks/Python.framework/Headers/**"; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = PyKerberos; + PRODUCT_NAME = kerberos.so; + SDKROOT = ""; + SYMROOT = /Volumes/scalawag/Users/gaya/xbuild; }; name = Release; }; @@ -209,7 +219,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = ""; + SYMROOT = ""; }; name = Debug; }; @@ -220,7 +231,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = ""; + SYMROOT = ""; USER_HEADER_SEARCH_PATHS = ..src; }; name = Release; @@ -228,7 +240,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "PyKerberos" */ = { + 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "kerberos.so" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923208733DC60010E9CD /* Debug */,

1 0

[13381] CalendarServer/trunk/twistedcaldav/directory/resource.py
by source_changes＠macosforge.org 29 Apr '14

29 Apr '14

Revision: 13381 http://trac.calendarserver.org//changeset/13381 Author: cdaboo(a)apple.com Date: 2014-04-29 09:28:05 -0700 (Tue, 29 Apr 2014) Log Message: ----------- Fix attribute to match .who implementation. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/resource.py Modified: CalendarServer/trunk/twistedcaldav/directory/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/resource.py 2014-04-29 01:23:50 UTC (rev 13380) +++ CalendarServer/trunk/twistedcaldav/directory/resource.py 2014-04-29 16:28:05 UTC (rev 13381) @@ -32,7 +32,7 @@ self.parent = parent self.record = record - super(DirectoryReverseProxyResource, self).__init__(self.record.serverID) + super(DirectoryReverseProxyResource, self).__init__(self.record.serviceNodeUID) def url(self):

1 0

[13380] CalendarServer/branches/release/CalendarServer-5.3-dev
by source_changes＠macosforge.org 29 Apr '14

29 Apr '14

Revision: 13380 http://trac.calendarserver.org//changeset/13380 Author: cdaboo(a)apple.com Date: 2014-04-28 18:23:50 -0700 (Mon, 28 Apr 2014) Log Message: ----------- Make sure purging of missing users correctly does implicit scheduling. Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/purge/accounts.xml CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/test_purge.py CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/aggregate.py Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/purge/accounts.xml =================================================================== --- CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/purge/accounts.xml 2014-04-29 01:08:01 UTC (rev 13379) +++ CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/purge/accounts.xml 2014-04-29 01:23:50 UTC (rev 13380) @@ -26,4 +26,11 @@ <name>Example User</name> <email-address>example(a)example.com</email-address> </user> + <user> + <uid>example2</uid> + <guid>37DB0C90-4DB1-4932-BC69-3DAB66F374F5</guid> + <password>example</password> + <name>Example User2</name> + <email-address>example2(a)example.com</email-address> + </user> </accounts> Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/test_purge.py =================================================================== --- CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/test_purge.py 2014-04-29 01:08:01 UTC (rev 13379) +++ CalendarServer/branches/release/CalendarServer-5.3-dev/calendarserver/tools/test/test_purge.py 2014-04-29 01:23:50 UTC (rev 13380) @@ -796,13 +796,33 @@ """.replace("\n", "\r\n") % (past,) +# Purging non-existent organizer; has existing attendee +EVENT_MISSING_ORGANIZER_ICS = """BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.1//EN +X-CALENDARSERVER-ACCESS:PRIVATE +BEGIN:VEVENT +UID:8ED97931-9A19-4596-9D4D-52B36D6AB803 +SUMMARY:Repeating Organizer +DTSTART:%s +DURATION:PT1H +ORGANIZER:urn:uuid:89D79D4C-DDF3-48EA-8C6A-71BD01FDC60D +ATTENDEE;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:urn:uuid:89D79D4C-DDF3-48EA-8C6A-71BD01FDC60D +ATTENDEE;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:urn:uuid:37DB0C90-4DB1-4932-BC69-3DAB66F374F5 +DTSTAMP:20100303T195203Z +END:VEVENT +END:VCALENDAR +""".replace("\n", "\r\n") % (past,) + + class PurgePrincipalTests(StoreTestCase): """ Tests for purging the data belonging to a given principal """ uid = "6423F94A-6B76-4A3A-815B-D52CFD77935D" uid2 = "37DB0C90-4DB1-4932-BC69-3DAB66F374F5" + uid3 = "89D79D4C-DDF3-48EA-8C6A-71BD01FDC60D" metadata = { "accessMode": "PUBLIC", @@ -817,26 +837,25 @@ "calendar1" : { "attachment.ics" : (ATTACHMENT_ICS, metadata,), "organizer.ics" : (REPEATING_PUBLIC_EVENT_ORGANIZER_ICS, metadata,), - } + }, + "inbox" : {}, }, uid2 : { "calendar2" : { - } + "missing.ics" : (EVENT_MISSING_ORGANIZER_ICS, metadata,), + }, + "inbox" : {}, }, + uid3 : { + "calendar3" : { + "missing.ics" : (EVENT_MISSING_ORGANIZER_ICS, metadata,), + }, + "inbox" : {}, + }, } @inlineCallbacks def setUp(self): - self.patch(config.DirectoryService.params, "xmlFile", - os.path.join( - os.path.dirname(__file__), "purge", "accounts.xml" - ) - ) - self.patch(config.ResourceService.params, "xmlFile", - os.path.join( - os.path.dirname(__file__), "purge", "resources.xml" - ) - ) yield super(PurgePrincipalTests, self).setUp() txn = self._sqlCalendarStore.newTransaction() @@ -871,6 +890,20 @@ (yield txn.commit()) + def configure(self): + super(PurgePrincipalTests, self).configure() + self.patch(config.DirectoryService.params, "xmlFile", + os.path.join( + os.path.dirname(__file__), "purge", "accounts.xml" + ) + ) + self.patch(config.ResourceService.params, "xmlFile", + os.path.join( + os.path.dirname(__file__), "purge", "resources.xml" + ) + ) + + @inlineCallbacks def populate(self): yield populateCalendarsFrom(self.requirements, self.storeUnderTest()) @@ -949,3 +982,30 @@ home = (yield txn.calendarHomeWithUID(self.uid)) self.assertNotEquals(home, None) (yield txn.commit()) + + + @inlineCallbacks + def test_purgeWithMissingOrganizer(self): + """ + Verify purgeUID sends cancels even when organizer is not in the directory + """ + + # Now you see it + home2 = yield self.homeUnderTest(name=self.uid2) + self.assertNotEquals(home2, None) + home3 = yield self.homeUnderTest(name=self.uid3) + self.assertNotEquals(home3, None) + + calobj2 = yield self.calendarObjectUnderTest(name="missing.ics", calendar_name="calendar2", home=self.uid2) + comp = yield calobj2.componentForUser() + self.assertTrue("STATUS:CANCELLED" not in str(comp)) + + yield self.commit() + + count, ignored = (yield PurgePrincipalService.purgeUIDs(self.storeUnderTest(), self.directory, + self.rootResource, (self.uid3,), verbose=False, proxies=False, completely=True)) + self.assertEquals(count, 1) # 1 events + + calobj2 = yield self.calendarObjectUnderTest(name="missing.ics", calendar_name="calendar2", home=self.uid2) + comp = yield calobj2.componentForUser() + self.assertTrue("STATUS:CANCELLED" in str(comp)) Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/aggregate.py =================================================================== --- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/aggregate.py 2014-04-29 01:08:01 UTC (rev 13379) +++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/aggregate.py 2014-04-29 01:23:50 UTC (rev 13380) @@ -192,6 +192,15 @@ def recordWithCalendarUserAddress(self, address): + # FIXME: These temporary records shouldn't be needed when we move + # to the new data store API. They're currently needed when purging + # deprovisioned users' data. + if address.startswith("urn:uuid:"): + uid = address[9:] + record = self._tmpRecords["uids"].get(uid, None) + if record: + return record + return self._queryAll("recordWithCalendarUserAddress", address)

1 0

[13379] CalendarServer/trunk/support/_cache_deps
by source_changes＠macosforge.org 29 Apr '14

29 Apr '14

Revision: 13379 http://trac.calendarserver.org//changeset/13379 Author: wsanchez(a)apple.com Date: 2014-04-28 18:08:01 -0700 (Mon, 28 Apr 2014) Log Message: ----------- clean up more Modified Paths: -------------- CalendarServer/trunk/support/_cache_deps Modified: CalendarServer/trunk/support/_cache_deps =================================================================== --- CalendarServer/trunk/support/_cache_deps 2014-04-29 01:05:45 UTC (rev 13378) +++ CalendarServer/trunk/support/_cache_deps 2014-04-29 01:08:01 UTC (rev 13379) @@ -53,15 +53,7 @@ curl -L -o "${wd}/.develop/tools/${pkg}.tgz" "${url}"; done; -for archive in $(find "${wd}/.develop/tools" -depth 1 -type f -name '*.tgz'); do - ruler "Cleaning up ${archive}"; - tmp="$(mktemp -d -t fooXXXX)"; - tar -C "${tmp}" --exclude '*.exe' -xvzf "${archive}"; - tar -C "${tmp}" -cvzf "${archive}" .; - rm -rf "${tmp}"; -done; - # # Download dependencies # @@ -72,3 +64,17 @@ --allow-unverified cx-Oracle \ --requirement="${requirements}" \ ; + + + +# +# Remove .exe files from arvhives +# + +for archive in $(find "${wd}/.develop" -type f -name '*.tgz'); do + ruler "Cleaning up ${archive}"; + tmp="$(mktemp -d -t fooXXXX)"; + tar -C "${tmp}" --exclude '*.exe' -xzf "${archive}"; + tar -C "${tmp}" -czf "${archive}" .; + rm -rf "${tmp}"; +done;

1 0

[13378] CalendarServer/trunk/support/_cache_deps
by source_changes＠macosforge.org 29 Apr '14

29 Apr '14

Revision: 13378 http://trac.calendarserver.org//changeset/13378 Author: wsanchez(a)apple.com Date: 2014-04-28 18:05:45 -0700 (Mon, 28 Apr 2014) Log Message: ----------- clean up Modified Paths: -------------- CalendarServer/trunk/support/_cache_deps Modified: CalendarServer/trunk/support/_cache_deps =================================================================== --- CalendarServer/trunk/support/_cache_deps 2014-04-28 23:39:50 UTC (rev 13377) +++ CalendarServer/trunk/support/_cache_deps 2014-04-29 01:05:45 UTC (rev 13378) @@ -53,7 +53,15 @@ curl -L -o "${wd}/.develop/tools/${pkg}.tgz" "${url}"; done; +for archive in $(find "${wd}/.develop/tools" -depth 1 -type f -name '*.tgz'); do + ruler "Cleaning up ${archive}"; + tmp="$(mktemp -d -t fooXXXX)"; + tar -C "${tmp}" --exclude '*.exe' -xvzf "${archive}"; + tar -C "${tmp}" -cvzf "${archive}" .; + rm -rf "${tmp}"; +done; + # # Download dependencies #

1 0