Skip to content

Commit

Permalink
Block JDS use for packages too. Finalize release.
Browse files Browse the repository at this point in the history
  • Loading branch information
Shea Craig committed Nov 25, 2014
1 parent 27f5163 commit c11ba6e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
### 0.2.3 (UNRELEASED) The Thing You've All Been Waiting For
### 0.3.0 (UNRELEASED) The Thing You've All Been Waiting For

FIXES:

- Example template SmartGroupTemplate.xml had a mistake with the %JSS_INVENTORY_NAME% variable.
- Fixed incorrect documentation for ```JSS_REPOS``` input variable

CHANGES:

- Marked ```JSS_REPO``` input variable as deprecated.
- Requires python-jss 0.4.2
- This adds support for JDS distribution points.
- Added several output variables.
- Input variable help mentions the change from categories of "Unknown" to "No Category Assigned".
- Removed all use of the value "*LEAVE_OUT*" from processor. (Previously used to skip a section).
- See README for information on individual elements of the processor. In general, leaving a key out entirely, or providing a blank value will skip that section.
- Reorganized package handling to manage JDS distribution points.

KNOWN ISSUES:

- python-jss now supports JDS distribution points. However, packages and scripts are corrupted on upload, and thus, you really should only use this for testing. We are working hard to solve this problem as soon as possible. Please see python-jss Issue [https://github.com/sheagcraig/python-jss/issues/5] for more information.

### 0.2.2 (October 8, 2014) Trotter Jelly

Expand Down
8 changes: 6 additions & 2 deletions JSSImporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

__all__ = ["JSSImporter"]
__version__ = '0.3.0'
REQUIRED_PYTHON_JSS_VERSION = StrictVersion('0.4.0')
REQUIRED_PYTHON_JSS_VERSION = StrictVersion('0.4.2')


class JSSImporter(Processor):
Expand Down Expand Up @@ -335,6 +335,11 @@ def handle_package(self):
#
# Passes the id of the newly created package object so JDS' will
# upload to the correct package object. Ignored by AFP/SMB.
for repo in self.env['JSS_REPOS']:
if isinstance(repo, jss.distribution_points.JDS):
self.output('JDS distribution type does not '
'currently support packages.')
exit()
if self.env["jss_package_added"]:
self._copy(self.env["pkg_path"], id_=package.id)
# For AFP/SMB shares, we still want to see if the package exists.
Expand Down Expand Up @@ -375,7 +380,6 @@ def _copy_old(self, source_item):

def _copy(self, source_item, id_=-1):
"""Copy a package or script using the new JSS_REPOS preference."""
#self.j.distribution_points.mount()
self.output("Copying %s to all distribution points." % source_item)
self.j.distribution_points.copy(source_item, id_=id_)
self.env["jss_repo_updated"] = True
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Configuring a JDS is pretty easy too. There's no automatic configuration for JDS

There are some caveats to using a JDS. At this time, there is no officially documented way to upload files, or check for their existence on the JDS. python-jss works around this as best it can, but there is a possibility that a package object can be created, with no package file uploaded (for example, by CTRL-C'ing out of an AutoPkg run while an upload is happening). If things get crazy, or packages seem to be missing, just delete the package object with the web interface and run again.

At this time, script uploading doesn't quite work, so it is disabled. Any recipes that require scripts will exit. I hope to solve this soon.
At this time, script and package uploading doesn't quite work. This of course makes this unusable on those systems. I hope to solve this soon.

Required keys:
- JDS
Expand Down
2 changes: 1 addition & 1 deletion version.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>Version</key>
<string>0.2.3</string>
<string>0.3.0</string>
</dict>
</plist>

0 comments on commit c11ba6e

Please sign in to comment.