Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-08-05 10:24:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2014-07-31 10:04:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-08-05 10:24:39.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Aug 4 16:12:14 UTC 2014 - [email protected] + +- RPM spec update + + added service_add_pre function + +------------------------------------------------------------------- +Fri Aug 1 19:41:12 UTC 2014 - [email protected] + +- Updated to 2014.1.10: + + Version 2014.1.9 contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. This version + contains the version detection fix, but is otherwise identical to 2014.1.9. + + Version 2014.1.8 contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. This version + contains the version detection fix, but is otherwise identical to 2014.1.8. + +------------------------------------------------------------------- Old: ---- salt-2014.1.8.tar.gz New: ---- salt-2014.1.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.1REMbO/_old 2014-08-05 10:24:41.000000000 +0200 +++ /var/tmp/diff_new_pack.1REMbO/_new 2014-08-05 10:24:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: salt -Version: 2014.1.8 +Version: 2014.1.10 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -314,6 +314,11 @@ %stop_on_removal salt-syndic %endif +%pre syndic +%if 0%{?_unitdir:1} +%service_add_pre salt-syndic.service +%endif + %post syndic %if 0%{?_unitdir:1} %service_add_post salt-syndic.service @@ -337,6 +342,11 @@ %stop_on_removal salt-master %endif +%pre master +%if 0%{?_unitdir:1} +%service_add_pre salt-master.service +%endif + %post master %if 0%{?_unitdir:1} %service_add_post salt-master.service @@ -360,6 +370,11 @@ %stop_on_removal salt-minion %endif +%pre minion +%if 0%{?_unitdir:1} +%service_add_pre salt-minion.service +%endif + %post minion %if 0%{?_unitdir:1} %service_add_post salt-minion.service ++++++ salt-2014.1.8.tar.gz -> salt-2014.1.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/PKG-INFO new/salt-2014.1.10/PKG-INFO --- old/salt-2014.1.8/PKG-INFO 2014-07-30 21:56:06.000000000 +0200 +++ new/salt-2014.1.10/PKG-INFO 2014-08-01 20:40:39.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: salt -Version: 2014.1.8 +Version: 2014.1.10 Summary: Portable, distributed, remote execution and configuration management system Home-page: http://saltstack.org Author: Thomas S Hatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/doc/topics/releases/2014.1.10.rst new/salt-2014.1.10/doc/topics/releases/2014.1.10.rst --- old/salt-2014.1.8/doc/topics/releases/2014.1.10.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-2014.1.10/doc/topics/releases/2014.1.10.rst 2014-08-01 20:36:57.000000000 +0200 @@ -0,0 +1,24 @@ +=========================== +Salt 2014.1.10 Release Notes +=========================== + +:release: 2014-08-01 + +.. note:: + + Verion 2014.1.9 contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. This version + contains the version detection fix, but is otherwise identical to 2014.1.9. + +Version 2014.1.10 is another bugfix release for :doc:`2014.1.0 +</topics/releases/2014.1.0>`. Changes include: + +- Ensure salt-ssh will not continue if permissions on a temporary directory are + not correct. +- Use the bootstrap script distributed with Salt instead of relying on an + external resource +- Remove unused testing code +- Ensure salt states are placed into the ``.salt`` directory in salt-ssh +- Use a randomized path for temporary files in a salt-cloud deployment +- Clean any stale directories to ensure a fresh copy of salt-ssh during a + deployment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/doc/topics/releases/2014.1.8.rst new/salt-2014.1.10/doc/topics/releases/2014.1.8.rst --- old/salt-2014.1.8/doc/topics/releases/2014.1.8.rst 2014-07-30 21:48:40.000000000 +0200 +++ new/salt-2014.1.10/doc/topics/releases/2014.1.8.rst 2014-08-01 20:36:57.000000000 +0200 @@ -4,6 +4,12 @@ :release: 2014-07-30 +.. note:: + + This release contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. Please use + version 2014.1.10 instead. + Version 2014.1.8 is another bugfix release for :doc:`2014.1.0 </topics/releases/2014.1.0>`. Changes include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/doc/topics/releases/2014.1.9.rst new/salt-2014.1.10/doc/topics/releases/2014.1.9.rst --- old/salt-2014.1.8/doc/topics/releases/2014.1.9.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-2014.1.10/doc/topics/releases/2014.1.9.rst 2014-08-01 20:36:57.000000000 +0200 @@ -0,0 +1,30 @@ +=========================== +Salt 2014.1.9 Release Notes +=========================== + +:release: 2014-07-31 + +.. note:: + + This release contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. Please use + version 2014.1.10 instead. + +.. note:: + + Verion 2014.1.8 contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. This version + contains the version detection fix, but is otherwise identical to 2014.1.8. + +Version 2014.1.9 is another bugfix release for :doc:`2014.1.0 +</topics/releases/2014.1.0>`. Changes include: + +- Ensure salt-ssh will not continue if permissions on a temporary directory are + not correct. +- Use the bootstrap script distributed with Salt instead of relying on an + external resource +- Remove unused testing code +- Ensure salt states are placed into the ``.salt`` directory in salt-ssh +- Use a randomized path for temporary files in a salt-cloud deployment +- Clean any stale directories to ensure a fresh copy of salt-ssh during a + deployment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/salt/_version.py new/salt-2014.1.10/salt/_version.py --- old/salt-2014.1.8/salt/_version.py 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-2014.1.10/salt/_version.py 2014-08-01 20:40:39.000000000 +0200 @@ -0,0 +1,5 @@ +# This file was auto-generated by salt's setup on Friday, 01 August 2014 @ 18:08:39 UTC. + +from salt.version import SaltStackVersion + +__saltstack_version__ = SaltStackVersion(2014, 1, 10, 0, 0, 0, None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/salt/utils/parsers.py new/salt-2014.1.10/salt/utils/parsers.py --- old/salt-2014.1.8/salt/utils/parsers.py 2014-07-30 21:48:57.000000000 +0200 +++ new/salt-2014.1.10/salt/utils/parsers.py 2014-08-01 20:38:41.000000000 +0200 @@ -142,7 +142,7 @@ class OptionParser(optparse.OptionParser): - VERSION = version.__version__ + VERSION = version.__saltstack_version__.formatted_version usage = '%prog' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.8/setup.py new/salt-2014.1.10/setup.py --- old/salt-2014.1.8/setup.py 2014-07-30 21:48:57.000000000 +0200 +++ new/salt-2014.1.10/setup.py 2014-08-01 20:38:41.000000000 +0200 @@ -95,6 +95,10 @@ os.path.abspath(SETUP_DIRNAME), 'salt', 'version.py' ) +SALT_VERSION_HARDCODED = os.path.join( + os.path.abspath(SETUP_DIRNAME), 'salt', '_version.py' +) + SALT_REQS = os.path.join( os.path.abspath(SETUP_DIRNAME), 'requirements.txt' ) @@ -109,7 +113,46 @@ # pylint: enable=W0122 -class CloudSdist(sdist): +class WriteSaltVersion(Command): + + description = 'Write salt\'s hardcoded version file' + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + if not os.path.exists(SALT_VERSION_HARDCODED): + # Write the version file + if getattr(self.distribution, 'salt_version_hardcoded_path', None) is None: + print 'This command is not meant to be called on it\'s own' + exit(1) + + # pylint: disable=E0602 + open(self.distribution.salt_version_hardcoded_path, 'w').write( + INSTALL_VERSION_TEMPLATE.format( + date=datetime.utcnow(), + full_version_info=__saltstack_version__.full_info + ) + ) + # pylint: enable=E0602 + + +class Sdist(sdist): + def make_release_tree(self, base_dir, files): + sdist.make_release_tree(self, base_dir, files) + + # Let's generate salt/_version.py to include in the sdist tarball + self.distribution.running_salt_sdist = True + self.distribution.salt_version_hardcoded_path = os.path.join( + base_dir, 'salt', '_version.py' + ) + self.run_command('write-salt-version') + + +class CloudSdist(Sdist): user_options = sdist.user_options + [ ('skip-bootstrap-download', None, '[DEPRECATED] Skip downloading the bootstrap-salt.sh script. This ' @@ -127,12 +170,12 @@ ] def initialize_options(self): - sdist.initialize_options(self) + Sdist.initialize_options(self) self.skip_bootstrap_download = True self.download_bootstrap_script = False def finalize_options(self): - sdist.finalize_options(self) + Sdist.finalize_options(self) if 'SKIP_BOOTSTRAP_DOWNLOAD' in os.environ: log('Please stop using \'SKIP_BOOTSTRAP_DOWNLOAD\' and use ' '\'DOWNLOAD_BOOTSTRAP_SCRIPT\' instead') @@ -186,7 +229,7 @@ ) # Let's the rest of the build command - sdist.run(self) + Sdist.run(self) def write_manifest(self): if IS_WINDOWS_PLATFORM: @@ -202,7 +245,7 @@ self.filelist.files.pop( self.filelist.files.index(filename) ) - return sdist.write_manifest(self) + return Sdist.write_manifest(self) class TestCommand(Command): @@ -240,12 +283,10 @@ def run(self): clean.run(self) # Let's clean compiled *.py[c,o] - remove_extensions = ('.pyc', '.pyo') for subdir in ('salt', 'tests', 'doc'): root = os.path.join(os.path.dirname(__file__), subdir) for dirname, dirnames, filenames in os.walk(root): - for to_remove_filename in glob.glob( - '{0}/*.py[oc]'.format(dirname)): + for to_remove_filename in glob.glob('{0}/*.py[oc]'.format(dirname)): os.remove(to_remove_filename) @@ -253,8 +294,9 @@ # This file was auto-generated by salt's setup on \ {date:%A, %d %B %Y @ %H:%m:%S UTC}. -__version__ = {version!r} -__version_info__ = {version_info!r} +from salt.version import SaltStackVersion + +__saltstack_version__ = SaltStackVersion{full_version_info!r} ''' @@ -283,19 +325,8 @@ # If our install attribute is present and set to True, we'll go # ahead and write our install time python modules. - # Write the version file - version_file_path = os.path.join( - self.build_lib, 'salt', '_version.py' - ) - # pylint: disable=E0602 - open(version_file_path, 'w').write( - INSTALL_VERSION_TEMPLATE.format( - date=datetime.utcnow(), - version=__version__, - version_info=__version_info__ - ) - ) - # pylint: enable=E0602 + # Write the hardcoded salt version module salt/_version.py + self.run_command('write-salt-version') # Write the system paths file system_paths_file_path = os.path.join( @@ -376,6 +407,9 @@ # Let's set the running_salt_install attribute so we can add # _version.py in the build command self.distribution.running_salt_install = True + self.distribution.salt_version_hardcoded_path = os.path.join( + self.build_lib, 'salt', '_version.py' + ) # Run install.run install.run(self) @@ -404,7 +438,9 @@ 'test': TestCommand, 'clean': Clean, 'build': Build, - 'install': Install + 'sdist': Sdist, + 'install': Install, + 'write-salt-version': WriteSaltVersion }, 'classifiers': ['Programming Language :: Python', 'Programming Language :: Cython', ++++++ use-forking-daemon.patch ++++++ --- /var/tmp/diff_new_pack.1REMbO/_old 2014-08-05 10:24:41.000000000 +0200 +++ /var/tmp/diff_new_pack.1REMbO/_new 2014-08-05 10:24:41.000000000 +0200 @@ -1,7 +1,7 @@ Index: salt-2014.1.8/pkg/salt-master.service =================================================================== ---- salt-2014.1.8.orig/pkg/salt-master.service -+++ salt-2014.1.8/pkg/salt-master.service +--- salt-2014.1.10.orig/pkg/salt-master.service ++++ salt-2014.1.10/pkg/salt-master.service @@ -3,8 +3,10 @@ Description=The Salt Master Server After=syslog.target network.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
