From 830dc2f0e34f91376620f4f15c9166e08f73ca85 Mon Sep 17 00:00:00 2001 From: Graham Date: Thu, 7 Nov 2019 09:40:26 -0600 Subject: [PATCH] version bump to include python-jss changes for urllib3 and hidden shares --- CHANGELOG.md | 5 +++++ JSSImporter.py | 8 ++++---- pkg/jssimporter/build-info.plist | 2 +- version.plist | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97615ec..8ca8aae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ All notable changes to this project will be documented in this file. This projec - The above efforts to improve package upload reliability may conversely cause problems on setups with multiple DPs of different types. Scenarios involving Cloud plus Local DPs are not yet tested, and there probably needs to be a more intelligent method of treating each DP as a separate package upload process than currently exists. +## [1.0.5] - 2019-11-05 - 1.0.5 + +This is a bugfix release to incorporate an updates to the bundled `python-jss` - an update to `urllib3` and a fix to allow hidden shares (with `$` in the share name). + + ## [1.0.4] - 2019-10-15 - 1.0.4 This is a bugfix release to improve performance for Jamf Cloud customers using a local DP as the Master. diff --git a/JSSImporter.py b/JSSImporter.py index 5402542..17dc671 100644 --- a/JSSImporter.py +++ b/JSSImporter.py @@ -38,7 +38,7 @@ __all__ = ["JSSImporter"] -__version__ = "1.0.4" +__version__ = "1.0.5" REQUIRED_PYTHON_JSS_VERSION = StrictVersion("2.0.1") @@ -479,8 +479,8 @@ def handle_package(self): self.repo_type() == "AFP" or self.repo_type() == "Local"): # For local DPs we check that the package is already on the distribution point and upload it if not if self.jss.distribution_points.exists(os.path.basename(pkg_path)): - self.output("Package '{}' found, so copy to {} repo not required." - "(Delete package from repo and re-run recipe if you need to" + self.output("Package '{}' found, so copy to {} repo not required. " + "(Delete package from repo and re-run recipe if you need to " "update it).".format(self.pkg_name, self.repo_type())) self.upload_needed = False else: @@ -503,7 +503,7 @@ def handle_package(self): else: # repo type that is not supported raise ProcessorError( - "JSSImporter can't upload the Package at '{}'! Repo type {} is not supported." + "JSSImporter can't upload the Package at '{}'! Repo type {} is not supported. " "Please reconfigure your JSSImporter prefs.".format(pkg_path, self.repo_type())) # only update the package object if an upload was carried out diff --git a/pkg/jssimporter/build-info.plist b/pkg/jssimporter/build-info.plist index 5a54ff1..bdfb81e 100644 --- a/pkg/jssimporter/build-info.plist +++ b/pkg/jssimporter/build-info.plist @@ -17,6 +17,6 @@ suppress_bundle_relocation version - 1.0.4 + 1.0.5 diff --git a/version.plist b/version.plist index 822b7fb..9041d97 100644 --- a/version.plist +++ b/version.plist @@ -3,6 +3,6 @@ Version - 1.0.4 + 1.0.5