Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2019-09-02 13:22:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Mon Sep 2 13:22:15 2019 rev:55 rq:727035 version:0.10.10.1566390389.9f923f8
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2019-06-26 16:01:01.675380453 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.7948/obs-service-tar_scm.changes
2019-09-02 13:22:20.021346492 +0200
@@ -1,0 +2,14 @@
+Thu Aug 22 11:25:57 UTC 2019 - fschrei...@suse.com
+
+- Update to version 0.10.10.1566390389.9f923f8:
+ * Revert "Merge pull request #323 from e4t/master"
+ * Make service 'tar' work with a cachedir as well
+ * Fix unit tests for modified scm directory handling
+ * Append '_service' to repository directory
+ * separate language and encoding
+ * git: really print the error message
+ * tar_scm.service: fix exclude documentation
+ * Don`t break testsuite if cwd contains colons
+ * disabling hg tests in travis
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz
New:
----
obs-service-tar_scm-0.10.10.1566390389.9f923f8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.O8gsq4/_old 2019-09-02 13:22:22.421346040 +0200
+++ /var/tmp/diff_new_pack.O8gsq4/_new 2019-09-02 13:22:22.425346040 +0200
@@ -90,8 +90,8 @@
######## END OF MACROS AND FUN ###################################
Name: obs-service-tar_scm
-%define version_unconverted 0.10.9.1559745964.22c86cd
-Version: 0.10.9.1559745964.22c86cd
+%define version_unconverted 0.10.10.1566390389.9f923f8
+Version: 0.10.10.1566390389.9f923f8
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.O8gsq4/_old 2019-09-02 13:22:22.441346036 +0200
+++ /var/tmp/diff_new_pack.O8gsq4/_new 2019-09-02 13:22:22.445346036 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.10.9.1559745964.22c86cd
+pkgver=0.10.10.1566390389.9f923f8
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.O8gsq4/_old 2019-09-02 13:22:22.461346033 +0200
+++ /var/tmp/diff_new_pack.O8gsq4/_new 2019-09-02 13:22:22.461346033 +0200
@@ -5,4 +5,4 @@
<param
name="url">git://github.com/M0ses/obs-service-tar_scm.git</param>
<param
name="changesrevision">b742dfc0e12755cf306a95439494b5bdde7c0c61</param></service><service
name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param
name="changesrevision">136e6bf6ac30d7e035d4e1f407b3bf56b9f7bcf1</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">9f923f8a0442e1a140c059807b4afebb8b6988d2</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.O8gsq4/_old 2019-09-02 13:22:22.473346031 +0200
+++ /var/tmp/diff_new_pack.O8gsq4/_new 2019-09-02 13:22:22.473346031 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.9.1559745964.22c86cd
+Version: 0.10.10.1566390389.9f923f8
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <adr...@suse.de>
++++++ obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz ->
obs-service-tar_scm-0.10.10.1566390389.9f923f8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/.travis.yml
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/.travis.yml
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/.travis.yml
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/.travis.yml
2019-08-21 14:26:29.000000000 +0200
@@ -4,11 +4,12 @@
- "3.6"
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -qq bzr git mercurial subversion tar
+ - sudo apt-get install -qq bzr git subversion tar
- sudo locale-gen en_US.UTF-8
install:
- pip install -r requirements.txt
- mkdir bin
- ln -s /usr/bin/true bin/obs-service-download_files # we don't test other
services here
- export PATH="$PWD/bin:$PATH"
+ - export
TAR_SCM_TC=UnitTestCases,TasksTestCases,SCMBaseTestCases,GitTests,SvnTests,TarTestCases
script: PV=${TRAVIS_PYTHON_VERSION:0:1};echo $PV;make check$PV
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/GNUmakefile
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/GNUmakefile
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/GNUmakefile
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/GNUmakefile
2019-08-21 14:26:29.000000000 +0200
@@ -120,11 +120,11 @@
.PHONY: test
test:
: Running the test suite. Please be patient - this takes a few minutes
...
- LANG=en_US.UTF-8 LC_TYPE=en_US.UTF-8 TAR_SCM_TESTMODE=1 PYTHONPATH=.
$(PYTHON) tests/test.py 2>&1 | tee ./test.log
+ TAR_SCM_TESTMODE=1 PYTHONPATH=. $(PYTHON) tests/test.py 2>&1 | tee
./test.log
test3:
: Running the test suite. Please be patient - this takes a few minutes
...
- LANG=en_US.UTF-8 LC_TYPE=en_US.UTF-8 TAR_SCM_TESTMODE=1 PYTHONPATH=.
python3 tests/test.py 2>&1 | tee ./test3.log
+ TAR_SCM_TESTMODE=1 PYTHONPATH=. python3 tests/test.py 2>&1 | tee
./test3.log
.PHONY: pylint
pylint: pylint2 pylinttest2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/cli.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/cli.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/cli.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/cli.py
2019-08-21 14:26:29.000000000 +0200
@@ -4,6 +4,8 @@
import os
import sys
import locale
+import subprocess
+import logging
def contains_dotdot(files):
@@ -17,6 +19,24 @@
return 0
+def check_locale(loc):
+ aloc_tmp = subprocess.check_output(['locale', '-a'])
+ aloc = dict()
+
+ for tloc in aloc_tmp.decode().split('\n'):
+ aloc[tloc] = 1
+
+ for tloc in loc:
+ logging.debug("Checking .... %s", tloc)
+ try:
+ if aloc[tloc]:
+ return tloc
+ except KeyError:
+ pass
+
+ return 'C'
+
+
class Cli():
# pylint: disable=too-few-public-methods
DEFAULT_AUTHOR = 'obs-service-tar-scm@invalid'
@@ -128,9 +148,11 @@
action='store_true',
help='do not cleanup directories before exiting '
'(Only for debugging)')
-
- parser.add_argument('--locale', default="en_US.UTF-8",
- help='set locale while service run')
+ parser.add_argument('--locale',
+ help='DEPRECATED - Please use "encoding" instead.'
+ ' Set locale while service run')
+ parser.add_argument('--encoding',
+ help='set encoding while service run')
self.verify_args(parser.parse_args(options))
@@ -167,15 +189,27 @@
# Allow forcing verbose mode from the environment; this
# allows debugging when running "osc service disabledrun" etc.
- args.verbose = bool(os.getenv('DEBUG_TAR_SCM'))
+ if bool(os.getenv('DEBUG_TAR_SCM')) or args.verbose:
+ logging.getLogger().setLevel(logging.DEBUG)
for attr in args.__dict__.keys():
self.__dict__[attr] = args.__dict__[attr]
if args.locale:
- locale.setlocale(locale.LC_ALL, args.locale)
- os.environ["LC_ALL"] = args.locale
- os.environ["LANG"] = args.locale
- os.environ["LANGUAGE"] = args.locale
+ use_locale = args.locale
+ elif args.encoding:
+ use_locale = check_locale([
+ "en_US.%s" % args.encoding,
+ "C.%s" % args.encoding])
+ else:
+ use_locale = check_locale(["en_US.utf8", 'C.utf8'])
+
+ logging.debug("Using locale: %s", use_locale)
+
+ locale.setlocale(locale.LC_ALL, use_locale)
+
+ os.environ["LC_ALL"] = use_locale
+ os.environ["LANG"] = use_locale
+ os.environ["LANGUAGE"] = use_locale
return args
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/helpers.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/helpers.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/helpers.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/helpers.py
2019-08-21 14:26:29.000000000 +0200
@@ -22,17 +22,11 @@
"""
logging.debug("COMMAND: %s" % cmd)
- # Ensure we get predictable results when parsing the output of commands
- # like 'git branch'
- env = os.environ.copy()
- env['LANG'] = 'en_US.UTF-8'
-
proc = subprocess.Popen(cmd,
shell=False,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
- cwd=cwd,
- env=env)
+ cwd=cwd)
output = ''
if interactive:
stdout_lines = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/scm/git.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/scm/git.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/scm/git.py
2019-08-21 14:26:29.000000000 +0200
@@ -217,8 +217,8 @@
rcode, out = self.helpers.run_cmd(cmd, self.clone_dir)
if rcode:
- msg = "\033[31m@TAG_OFFSET@ can not be expanded: %s\033[0m"
- msg.format(out)
+ msg = "\033[31m@TAG_OFFSET@ can not be expanded: {}\033[0m"
+ msg = msg.format(out)
sys.exit(msg)
tag_offset = out.strip()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/scm/svn.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/scm/svn.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/scm/svn.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/scm/svn.py
2019-08-21 14:26:29.000000000 +0200
@@ -95,8 +95,7 @@
except SystemExit as exc:
if re.search(ENCODING_RE, exc.code):
raise SystemExit(ENCODING_MSG)
- else:
- raise exc
+ raise exc
def update_cache(self):
"""Update sources via svn."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/tasks.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/tasks.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/TarSCM/tasks.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/tasks.py
2019-08-21 14:26:29.000000000 +0200
@@ -149,8 +149,6 @@
logging.basicConfig(format="%(message)s", stream=sys.stderr,
level=logging.INFO)
- if args.verbose:
- logging.getLogger().setLevel(logging.DEBUG)
# force cleaning of our workspace on exit
atexit.register(self.cleanup)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tar_scm.service.in
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tar_scm.service.in
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tar_scm.service.in
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tar_scm.service.in
2019-08-21 14:26:29.000000000 +0200
@@ -118,7 +118,7 @@
<description>Specify suffix name of package, which is used together with
filename to determine tarball name.</description>
</parameter>
<parameter name="exclude">
- <description>Specify regexp to exclude when creating the
tarball.</description>
+ <description>Specify glob pattern to exclude when creating the
tarball.</description>
</parameter>
<parameter name="include">
<description>Specify subset of files/subdirectories to pack in the
tarball.</description>
@@ -154,6 +154,9 @@
<description>Specify author of the changes file entry to be written.
Defaults to first email entry in ~/.oscrc, or "obs-service-tar-scm@invalid" if
there is no .oscrc found.</description>
</parameter>
<parameter name="locale">
- <description>Set locale while execution of service</description>
+ <description>DEPRECATED - Please use "encoding" instead. Set locale while
execution of service</description>
+ </parameter>
+ <parameter name="encoding">
+ <description>Set encoding while execution of service</description>
</parameter>
</service>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tests/scmlogs.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/scmlogs.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tests/scmlogs.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/scmlogs.py
2019-08-21 14:26:29.000000000 +0200
@@ -2,6 +2,7 @@
from __future__ import print_function
import glob
import os
+import tempfile
class ScmInvocationLogs:
@@ -21,18 +22,17 @@
"""
@classmethod
- def setup_bin_wrapper(cls, scm, tmp_dir):
- cls.wrapper_dir = tmp_dir + '/wrappers'
+ def setup_bin_wrapper(cls, scm, tests_dir):
+ wrapper_dir = tempfile.mkdtemp(dir="/tmp")
- if not os.path.exists(cls.wrapper_dir):
- os.makedirs(cls.wrapper_dir)
+ wrapper_src = os.path.join(tests_dir, 'scm-wrapper')
+ wrapper_dst = wrapper_dir + '/' + scm
- wrapper = cls.wrapper_dir + '/' + scm
- if not os.path.exists(wrapper):
- os.symlink('../../scm-wrapper', wrapper)
+ if not os.path.exists(wrapper_dst):
+ os.symlink(wrapper_src, wrapper_dst)
path = os.getenv('PATH')
- prepend = cls.wrapper_dir + ':'
+ prepend = wrapper_dir + ':'
if not path.startswith(prepend):
new_path = prepend + path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tests/testenv.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/testenv.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tests/testenv.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/testenv.py
2019-08-21 14:26:29.000000000 +0200
@@ -42,7 +42,7 @@
if cls.is_setup:
return
print("--v-v-- begin setupClass for %s --v-v--" % cls.__name__)
- ScmInvocationLogs.setup_bin_wrapper(cls.scm, cls.tmp_dir)
+ ScmInvocationLogs.setup_bin_wrapper(cls.scm, cls.tests_dir)
os.putenv('TAR_SCM_CLEAN_ENV', 'yes')
os.environ['TAR_SCM_CLEAN_ENV'] = 'yes'
cls.is_setup = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tests/utils.py
new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/utils.py
--- old/obs-service-tar_scm-0.10.9.1559745964.22c86cd/tests/utils.py
2019-06-05 16:46:04.000000000 +0200
+++ new/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/utils.py
2019-08-21 14:26:29.000000000 +0200
@@ -7,6 +7,7 @@
import re
import shutil
import subprocess
+import six
def mkfreshdir(path):
@@ -22,6 +23,12 @@
def run_cmd(cmd):
+ os.putenv('LANG', 'C.utf-8')
+ os.putenv('LC_ALL', 'C.utf-8')
+ os.environ['LANG'] = 'C.utf-8'
+ os.environ['LC_ALL'] = 'C.utf-8'
+ if six.PY3:
+ cmd = cmd.encode('UTF-8')
proc = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -60,7 +67,4 @@
def run_bzr(repo, args):
- os.putenv('LANG', 'C')
- os.environ['LANG'] = 'C'
-
return run_scm('bzr', repo, args)
