Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2017-01-23 11:39:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2017-01-09 10:55:14.611899740 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes 2017-01-23 11:40:39.410076940 +0100 @@ -1,0 +2,6 @@ +Tue Jan 10 21:07:47 UTC 2017 - opensuse-packaging@opensuse.org + +- Update to version 0.7.0.1484082405.7671be8: + * fix problems with generatechanges when ~/.obs/tar_scm exists + +------------------------------------------------------------------- Old: ---- obs-service-tar_scm-0.7.0.1481203567.804351a.tar.gz New: ---- obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-tar_scm.spec ++++++ --- /var/tmp/diff_new_pack.RMP4A5/_old 2017-01-23 11:40:39.806020780 +0100 +++ /var/tmp/diff_new_pack.RMP4A5/_new 2017-01-23 11:40:39.810020213 +0100 @@ -1,7 +1,7 @@ # # spec file for package obs-service # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.7.0.1481203567.804351a +%define version_unconverted 0.7.0.1484082405.7671be8 Name: obs-service-obs_scm %else -%define version_unconverted 0.7.0.1481203567.804351a +%define version_unconverted 0.7.0.1484082405.7671be8 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.7.0.1481203567.804351a +Version: 0.7.0.1484082405.7671be8 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.RMP4A5/_old 2017-01-23 11:40:39.862012838 +0100 +++ /var/tmp/diff_new_pack.RMP4A5/_new 2017-01-23 11:40:39.862012838 +0100 @@ -3,4 +3,4 @@ <param name="url">git://github.com/adrianschroeter/obs-service-tar_scm.git</param> <param name="changesrevision">d44d677cf006d48b261f5e2054ba2126bed64ae1</param></service><service name="tar_scm"> <param name="url">git://github.com/M0ses/obs-service-tar_scm.git</param> - <param name="changesrevision">804351ac0ab324442d3be0a830fa8b15e2adc31c</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">7671be8f317658daec2bb24970bcba791396d9bd</param></service></servicedata> \ No newline at end of file ++++++ obs-service-tar_scm-0.7.0.1481203567.804351a.tar.gz -> obs-service-tar_scm-0.7.0.1484082405.7671be8.tar.gz ++++++ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/__init__.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/__init__.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/archive.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/archive.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/changes.py new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/changes.py --- old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/changes.py 2016-12-08 14:26:07.000000000 +0100 +++ new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/changes.py 2017-01-10 22:06:45.000000000 +0100 @@ -210,8 +210,8 @@ # find changesauthor in $HOME/.oscrc try: - files = [os.path.join(os.environ['HOME'], '.oscrc')] - cfg = config(files, False) + files = [[os.path.join(os.environ['HOME'], '.oscrc'),False]] + cfg = config(files) changesauthor = None section = cfg.get('general', 'apiurl') Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/changes.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/changes.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/cli.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/cli.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/config.py new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/config.py --- old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/config.py 2016-12-08 14:26:07.000000000 +0100 +++ new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/config.py 2017-01-10 22:06:45.000000000 +0100 @@ -18,33 +18,32 @@ class config(): def __init__( self, - files=['/etc/obs/services/tar_scm'], - fakeheader=True + files=[['/etc/obs/services/tar_scm',True]] ): try: - rc_file = os.path.join(os.environ['HOME'], '.obs', 'tar_scm') + rc_file = [os.path.join(os.environ['HOME'], '.obs', 'tar_scm'),True] files.append(rc_file) except KeyError: pass self.configs = [] self.default_section = 'tar_scm' - self.fakeheader = fakeheader # We're in test-mode, so don't let any local site-wide # or per-user config impact the test suite. if os.getenv('DEBUG_TAR_SCM'): logging.info("Ignoring config files: test-mode detected") # fake a section header for configuration files - for fname in files: + for tmp in files: + fname = tmp[0] + self.fakeheader = tmp[1] if not os.path.isfile(fname): - print("Config file not found: %s" % fname) + logging.debug("Config file not found: %s" % fname) continue self.configs.append(self._init_config(fname)) # strip quotes from pathname for config in self.configs: - print(config) for section in config.sections(): for opt in config.options(section): config.set( @@ -62,7 +61,7 @@ config.optionxform = str if self.fakeheader: - print("Using fakeheader for file '%s'" % fname) + logging.debug("Using fakeheader for file '%s'" % fname) tmp_fp = StringIO() tmp_fp.write('[' + self.default_section + ']\n') tmp_fp.write(open(fname, 'r').read()) @@ -83,7 +82,7 @@ if section is None and self.fakeheader: section = self.default_section - print("SECTION: %s" % section) + logging.debug("SECTION: %s" % section) for config in self.configs: try: value = config.get(section, option) Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/config.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/config.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/exceptions.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/exceptions.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/helpers.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/helpers.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/__init__.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/__init__.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/base.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/base.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/bzr.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/bzr.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/git.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/git.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/hg.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/hg.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/svn.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/svn.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/scm/tar.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/scm/tar.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/TarSCM/tasks.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/TarSCM/tasks.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tar_scm.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tar_scm.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/__init__.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/__init__.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/bzrfixtures.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/bzrfixtures.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/bzrtests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/bzrtests.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/commontests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/commontests.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/fixtures/UnitTestCases/test_TarSCM_changes_get_changesauthor_from_home_rc/.oscrc new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/fixtures/UnitTestCases/test_TarSCM_changes_get_changesauthor_from_home_rc/.oscrc --- old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/fixtures/UnitTestCases/test_TarSCM_changes_get_changesauthor_from_home_rc/.oscrc 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/fixtures/UnitTestCases/test_TarSCM_changes_get_changesauthor_from_home_rc/.oscrc 2017-01-10 22:06:45.000000000 +0100 @@ -0,0 +1,5 @@ +[general] +apiurl = http://api.example.com + +[http://api.example.com] +email = devel@example.com Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/fixtures.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/fixtures.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/gitfixtures.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/gitfixtures.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/githgtests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/githgtests.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/gitsvntests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/gitsvntests.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/gittests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/gittests.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/hgfixtures.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/hgfixtures.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/hgtests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/hgtests.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/scm.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/scm.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/scmlogs.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/scmlogs.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/svnfixtures.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/svnfixtures.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/svntests.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/svntests.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/tasks.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/tasks.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/test.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/test.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/testassertions.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/testassertions.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/testenv.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/testenv.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/unittestcases.py new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/unittestcases.py --- old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/unittestcases.py 2016-12-08 14:26:07.000000000 +0100 +++ new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/unittestcases.py 2017-01-10 22:06:45.000000000 +0100 @@ -85,18 +85,18 @@ def test_TarSCM_config_files_ordering(self): tc_name = inspect.stack()[0][3] files = [ - os.path.join(self.fixtures_dir, tc_name, 'a.cfg'), - os.path.join(self.fixtures_dir, tc_name, 'b.cfg'), + [os.path.join(self.fixtures_dir, tc_name, 'a.cfg'),True], + [os.path.join(self.fixtures_dir, tc_name, 'b.cfg'),True], ] var = config(files).get(None, 'var') self.assertEqual(var, 'b') def test_TarSCM_config_no_faked_header(self): tc_name = inspect.stack()[0][3] - files = [os.path.join(self.fixtures_dir, tc_name, 'test.ini')] - var = config(files, False).get('general', 'apiurl') + files = [[os.path.join(self.fixtures_dir, tc_name, 'test.ini'),False]] + var = config(files).get('general', 'apiurl') self.assertEqual(var, 'http://api.example.com') - var = config(files, False).get(var, 'email') + var = config(files).get(var, 'email') self.assertEqual(var, 'devel@example.com') def test_TarSCM_config_debug_tar_scm(self): @@ -109,7 +109,7 @@ os.environ['DEBUG_TAR_SCM'] = "1" - files = [os.path.join(self.fixtures_dir, tc_name, 'test.rc')] + files = [[os.path.join(self.fixtures_dir, tc_name, 'test.rc'),True]] var = config(files).get(None, 'var') self.assertEqual(var, None) @@ -143,6 +143,15 @@ os.environ['HOME'] = home self.assertEqual(ca, 'opensuse-packaging@opensuse.org') + def test_TarSCM_changes_get_changesauthor_from_home_rc(self): + tc_name = inspect.stack()[0][3] + home = os.environ['HOME'] + os.environ['HOME'] = os.path.join(self.fixtures_dir, tc_name) + c = changes() + ca = c.get_changesauthor(self.cli) + os.environ['HOME'] = home + self.assertEqual(ca, 'devel@example.com') + def test_git_get_repocache_hash_without_subdir(self): scm_object = git(self.cli, self.tasks) scm_object.url = 'https://github.com/openSUSE/obs-service-tar_scm.git' Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/unittestcases.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/unittestcases.pyc differ Binary files old/obs-service-tar_scm-0.7.0.1481203567.804351a/tests/utils.pyc and new/obs-service-tar_scm-0.7.0.1484082405.7671be8/tests/utils.pyc differ