Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2020-05-09 19:52:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Sat May 9 19:52:11 2020 rev:59 rq:801101 version:0.10.15.1588842879.5c43eef
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2020-03-25 23:41:29.607958217 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.2738/obs-service-tar_scm.changes
2020-05-09 19:52:18.796832586 +0200
@@ -1,0 +2,16 @@
+Thu May 07 09:33:04 UTC 2020 - [email protected]
+
+- Update to version 0.10.15.1588842879.5c43eef:
+ * dist: Convert to multibuild; run test suite in a separate flavor
+
+-------------------------------------------------------------------
+Wed Apr 29 13:48:30 UTC 2020 - [email protected]
+
+- Update to version 0.10.15.1588146746.5cfeeb8:
+ * fix #boo 1168573 (obsservicerun,obsrun) not exists in client side
installation
+ * Update debian/changelog for latest version
+ * Helpers: when a command fail, print the command itself too with its output
+ * git: add support for @PARENT_TAG@ in revision
+ * Fix build on non-openSUSE distro
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz
New:
----
_multibuild
obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.mfwnT9/_old 2020-05-09 19:52:19.832834810 +0200
+++ /var/tmp/diff_new_pack.mfwnT9/_new 2020-05-09 19:52:19.832834810 +0200
@@ -16,12 +16,24 @@
#
-%if 0%{?suse_version} && 0%{?suse_version} >= 1220
+%define flavor @BUILD_FLAVOR@%nil
+%if "%{flavor}" == ""
+%define nsuffix %nil
+%else
+%define nsuffix -test
+%endif
+
+%if 0%{?suse_version} && 0%{?suse_version} >= 1220 && "%{flavor}" == "test"
%bcond_without obs_scm_testsuite
%else
%bcond_with obs_scm_testsuite
%endif
+# special guard for flavor test, yet --without test being specified
+%if "%{flavor}" == "test" && %{without obs_scm_testsuite}
+ExclusiveArch: skip-build
+%endif
+
%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29
%bcond_without python3
%else
@@ -84,20 +96,23 @@
Recommends: mercurial \
Recommends: subversion \
Recommends: obs-service-download_files \
+Recommends: %{use_python}-keyring \
+Recommends: %{use_python}-keyrings.alt \
%endif \
%{nil}
######## END OF MACROS AND FUN ###################################
-Name: obs-service-tar_scm
-%define version_unconverted 0.10.14.1584463383.06b0455
-Version: 0.10.14.1584463383.06b0455
+%define pkg_name obs-service-tar_scm
+Name: %{pkg_name}%{nsuffix}
+%define version_unconverted 0.10.15.1588842879.5c43eef
+Version: 0.10.15.1588842879.5c43eef
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
Group: Development/Tools/Building
URL: https://github.com/openSUSE/obs-service-tar_scm
-Source: %{name}-%{version}.tar.gz
+Source: %{pkg_name}-%{version}.tar.gz
# Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
# based distributions
@@ -105,6 +120,9 @@
%if %{with obs_scm_testsuite}
BuildRequires: %{locale_package}
+BuildRequires: %{pkg_name} = %{version}
+BuildRequires: %{use_python}-keyring
+BuildRequires: %{use_python}-keyrings.alt
BuildRequires: %{use_python}-mock
BuildRequires: %{use_python}-six
BuildRequires: %{use_python}-unittest2
@@ -124,7 +142,7 @@
BuildRequires: %{use_python}-lxml
%if %{with python3}
-BuildRequires: %{use_python}
+BuildRequires: %{use_python}-base
# Fix missing Requires in python3-pbr in Leap42.3
BuildRequires: %{use_python}-setuptools
%else
@@ -222,9 +240,10 @@
%build
%install
+%if %{without obs_scm_testsuite}
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}"
-%if %{with obs_scm_testsuite}
+%else
# moved conditional to the top as it helps to have it all in one place and
only rely on the bcond_with here.
%check
# No need to run PEP8 tests here; that would require a potentially
@@ -233,6 +252,7 @@
make %{use_test}
%endif
+%if %{without obs_scm_testsuite}
%files
%defattr(-,root,root)
%{_prefix}/lib/obs/service/tar_scm.service
@@ -245,7 +265,7 @@
%{_prefix}/lib/obs/service/tar_scm
%dir %{_sysconfdir}/obs
%dir %{_sysconfdir}/obs/services
-%attr(-,obsservicerun,obsrun) %dir %{_sysconfdir}/obs/services/tar_scm.d
+%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
%config(noreplace) %{_sysconfdir}/obs/services/*
%files -n obs-service-tar
@@ -271,5 +291,6 @@
%defattr(-,root,root)
%{_prefix}/lib/obs/service/obs_gbp*
%endif
+%endif
%changelog
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.mfwnT9/_old 2020-05-09 19:52:19.864834878 +0200
+++ /var/tmp/diff_new_pack.mfwnT9/_new 2020-05-09 19:52:19.864834878 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.10.14.1584463383.06b0455
+pkgver=0.10.15.1588842879.5c43eef
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _multibuild ++++++
<multibuild>
<flavor>test</flavor>
</multibuild>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.mfwnT9/_old 2020-05-09 19:52:19.916834990 +0200
+++ /var/tmp/diff_new_pack.mfwnT9/_new 2020-05-09 19:52:19.916834990 +0200
@@ -7,4 +7,4 @@
<param
name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param
name="changesrevision">d912143a87161e3c306c021f8e122140068a1dc6</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">3fd7b0fa6bec9adb01500a59cc5424d34cb1b005</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.mfwnT9/_old 2020-05-09 19:52:19.932835025 +0200
+++ /var/tmp/diff_new_pack.mfwnT9/_new 2020-05-09 19:52:19.936835033 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.14.1584463383.06b0455
+Version: 0.10.15.1588842879.5c43eef
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
++++++ obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz ->
obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/TarSCM/helpers.py
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/TarSCM/helpers.py
--- old/obs-service-tar_scm-0.10.14.1584463383.06b0455/TarSCM/helpers.py
2020-03-17 17:43:03.000000000 +0100
+++ new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/TarSCM/helpers.py
2020-05-07 11:14:39.000000000 +0200
@@ -45,7 +45,7 @@
if proc.returncode and raisesysexit:
logging.info("ERROR(%d): %s", proc.returncode, repr(output))
raise SystemExit(
- "Command failed(%d): '%s'" % (proc.returncode, output)
+ "Command %s failed(%d): '%s'" % (cmd, proc.returncode, output)
)
else:
logging.debug("RESULT(%d): %s", proc.returncode, repr(output))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/TarSCM/scm/git.py
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.10.14.1584463383.06b0455/TarSCM/scm/git.py
2020-03-17 17:43:03.000000000 +0100
+++ new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/TarSCM/scm/git.py
2020-05-07 11:14:39.000000000 +0200
@@ -33,11 +33,19 @@
- short branch name: "master", "devel" etc.
- explicit ref: refs/heads/master, refs/tags/v1.2.3,
refs/changes/49/11249/1
+ - wildcard to match latest tag: @PARENT_TAG@
"""
logging.debug("[switch_revision] Starting ...")
if self.revision is None:
self.revision = 'master'
+ if self.revision == "@PARENT_TAG@":
+ self.revision = self._detect_parent_tag()
+ if not self.revision:
+ sys.exit("\033[31mNo parent tag present for the checked out "
+ "revision, thus @PARENT_TAG@ cannot be expanded."
+ "\033[0m")
+
if os.getenv('OSC_VERSION') and \
len(os.listdir(self.clone_dir)) > 1:
# Ensure that the call of "git stash" is done with
@@ -101,6 +109,13 @@
os.removedirs(os.path.join(wdir, self.clone_dir))
raise exc
+ if self.revision == "@PARENT_TAG@":
+ self.revision = self._detect_parent_tag()
+ if not self.revision:
+ sys.exit("\033[31mNo parent tag present for the checked out "
+ "revision, thus @PARENT_TAG@ cannot be expanded."
+ "\033[0m")
+
self.fetch_specific_revision()
if self.revision and not self.repocachedir:
@@ -212,11 +227,11 @@
)[1]
return self.version_iso_cleanup(version, debian)
- def _detect_parent_tag(self, args):
+ def _detect_parent_tag(self, args=None):
parent_tag = ''
cmd = self._get_scm_cmd() + ['describe', '--tags', '--abbrev=0']
try:
- if args['match_tag']:
+ if args and args['match_tag']:
cmd.append("--match=%s" % args['match_tag'])
except KeyError:
pass
@@ -338,6 +353,13 @@
self.helpers.safe_run(
command, cwd=wdir, interactive=sys.stdout.isatty())
+ if self.revision == "@PARENT_TAG@":
+ self.revision = self._detect_parent_tag()
+ if not self.revision:
+ sys.exit("\033[31mNo parent tag present for the checked out "
+ "revision, thus @PARENT_TAG@ cannot be expanded."
+ "\033[0m")
+
if self.revision and not self._ref_exists(self.revision):
refspec = self.revision + ":" + self.revision
cmd = self._get_scm_cmd() + ['fetch', 'origin', refspec]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/debian/changelog
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/debian/changelog
--- old/obs-service-tar_scm-0.10.14.1584463383.06b0455/debian/changelog
2020-03-17 17:43:03.000000000 +0100
+++ new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/debian/changelog
2020-05-07 11:14:39.000000000 +0200
@@ -1,3 +1,585 @@
+obs-service-tar-scm (0.10.14) unstable; urgency=medium
+
+ [ Roman Neuhauser ]
+ * be explicit about python2, python may be python3
+
+ [ Dr. Stefan Schimanski ]
+ * Fix newline at the end of @PARENT_TAG@
+
+ [ Jan Blunck ]
+ * Fix Mercurial version format strings in unittest
+ * Refactoring of package metadata regex matching
+ * Refactor resetting of uid/gid so that it is reusable
+ * Fix handling of --include option
+ * Fix handling of --exclude option
+ * Refactor subdir handling of tarchecker's to prevent code duplication
+
+ [ Adam Spiers ]
+ * ignore PEP8's E731 check for lambdas
+ * PEP8 E402 fix: set PYTHONPATH outside code
+
+ [ xufasheng ]
+ * add @TAG_OFFSET@ support in versionformat for git
+
+ [ Adam Spiers ]
+ * fix inconsistencies in tar_scm.service
+
+ [ Adrian Schröter ]
+ * - fix .service file syntax (OBS 2.6.1 is checking now)
+
+ [ Fabian Dörk ]
+ * Split up the steps of git cloning and submodule initialization
+
+ [ Adam Spiers ]
+ * mention need to set PYTHONPATH when running tests
+ * keep STDERR separate
+ * don't allow --subdir to wander outside repo (bsc#927120, #71)
+ * fix Makefile test runner for Debian
+ * use the same Python interpreter for testing tar_scm
+
+ [ Jan Blunck ]
+ * Add missing extension parameter to service file
+
+ [ Hib Eris ]
+ * Fix build on Debian 7.0/8.0
+
+ [ Christian Felder ]
+ * Add sslverify parameter.
+ * git fetch remote refs.
+ * Add new method run_cmd with raisesysexit argument.
+ * Add new method git_ref_exists.
+
+ [ Jan Engelhardt ]
+ * Restore color output
+ * Correct error message about lack of git tags
+
+ [ Christian Felder ]
+ * GNUmakefile: Use default python in $PATH unless it is a python 3.
+
+ [ Adam Spiers ]
+ * fix TESTING.md link in CONTRIBUTING.md
+
+ [ Martin Pluskal ]
+ * Use correct level 2 bullet point (*)
+
+ [ Adrian Schröter ]
+ * very first obs_scm implementation
+ * allow extracting of (spec) files
+ * allow to include local changes when using "obs_scm" service via local
+ osc commands.
+ * make obsinfo parameter for tar service optional
+ * support filtering on creation of cpio archives
+
+ [ Jan Engelhardt ]
+ * Allow to manually specify a base for @TAG_OFFSET@
+
+ [ Adrian Schröter ]
+ * - add debian provides
+ * - make cleaning message a debug message
+
+ [ Thomas Bechtold ]
+ * Honour "subdir" param for changesgenerate
+
+ [ Adrian Schröter ]
+ * report error when specified revision got not found
+
+ [ Jan Blunck ]
+ * Extend fixture to create commits with a specific timestamp
+ * Use commit timestamp as mtime for files and directories in tarball
+ * Workaround bug in Mercurial localdate filter
+
+ [ Adam Spiers ]
+ * fix breakage from conflict of #63 and #85
+
+ [ Thorsten Behrens ]
+ * Provide test for git tag fetching
+
+ [ Rob Zebedee ]
+ * Add ability to generate changes file when using svn
+
+ [ Adrian Schröter ]
+ * add snapcraft.yaml support
+ * merge upstream
+ * minor cleanup
+ * fix typo, wrong file name of new snapcraft.yaml
+ * fix some more merge regressions
+ * pep8 fixes/workarounds
+ * make yaml dependency optional for travis
+
+ [ Nick Wang ]
+ * Add an option 'master' to submodules to fetch the latest mater branch.
+
+ [ Markos Chandras ]
+ * tar_scm.py: Always use an absolute path for the 'output' directory
+
+ [ Adrian Schröter ]
+ * do not set files back to 1970...
+ * transfer mtime via obsinfo
+ * create needed sub directories for cache handling
+ * prefer local cache directory
+ * - weak dependency to mercurial for debian
+ * add python-dateutil require for debian
+ * testing on debian is broken atm
+
+ [ Adam Spiers ]
+ * temporarily disable PEP8 test whilst we reconverge with OBS
+
+ [ Frank Schreiner ]
+ * initial version of TarSCM classes
+ * scm_object generation moved to singletask
+ * FETCH_UPSTREAM_COMMANDS into classes
+ * moved update_cache_* to classes
+ * moved detect_version into classes and refactored calls of
+ get_timestamp_*
+ * moved get_timestamp functions into scm classes
+ * git_ref_exists -> TarSCM.git._ref_exists
+ * fetch_upstream_git_submodules -> fetch_submodules to get rid of
+ exceptions for git
+ * just moved some functions for better overview
+ * refactor of detect_changes into classes
+ * url as attribute of TarSCM.scm
+ * run_cmd and safe_run moved into class helpers
+ * combine os.path.join statement
+ * refactoring fetch_upstream to be part of TarSCM.scm
+ * new classes for archives
+ * common method 'get_current_commit' to get rid of exception for git
+ * refactored detect_changes to get rid of changesgenerate exception
+ * get_repocachedir -> TarSCM.scm
+
+ [ Kristýna Streitová ]
+ * Add description to the README.md file
+
+ [ Frank Schreiner ]
+ * revision, repodir and repocachedir as attribute for TarSCM.<scm>
+ * new class TarSCM.cli to make testing easier
+ * testing script name more reliable
+ * fixed arguments for singletask in case of snapcraft
+ * refactored snapcraft code + first tests for snapcraft
+ * added testcase for snapcraft finalize
+ * split classes into several files
+
+ [ Adam Spiers ]
+ * track module dependencies in requirements.txt
+ * use unittest2 in Python 2.6
+
+ [ Frank Schreiner ]
+ * more testing for TarSCM.tasks
+ * clone_dir/repodir/arch_dir(tar_dir)/args now attributes of scm objects
+ * test case for save_run
+ * major refactor of git cache handling
+ * consolidation of archive.obscpio and archive.tar parameters
+ * next test cases
+ * unset CACHEDIRECTORY env variable in unit tests
+ * update atime/mtime of repocachedir if already exists
+ * prevent key errors when $HOME is not set
+ * fix PEP8 problems and reenable PEP8 testing
+ * keep checkout while running with osc
+ * fix local checkout when running in osc
+ * force remove of files while 'make clean'
+ * fix: also exclude directories when called .git
+ * fix problems with generatechanges when ~/.obs/tar_scm exists
+
+ [ Adrian Schröter ]
+ * initial appimage support
+
+ [ boombatower ]
+ * Provide version rewrite using a regex pattern and replacement.
+
+ [ Frank Schreiner ]
+ * new parameter --match-tag to filter tags
+ * keep .gitlab/.github directories
+ * skip broken tests temporarily
+ * fix for nonexistant build section in appimage.yml
+ * [lint] improve inline doc in TarSCM/tasks.py
+ * [lint] refactor attribute dataMap in TarSCM.tasks
+ * [lint] refactor invalid variable names in TarSCM.tasks
+ * [lint] remove variable helpers from TarSCM.tasks
+ * [lint] rename variable changes -> detected_changes in TarSCM.tasks
+ * [lint] fixed 'line-to-long' error in TarSCM.tasks
+ * more documentation for README.md
+
+ [ ailin-nemui ]
+ * Update control
+
+ [ Frank Schreiner ]
+ * [tests] new env var TAR_SCM_TC to select test cases
+ * [lint] change comment at start of tests/test.py
+ * [lint] refactor __main__
+ * [lint] get rid of cell-var-from-loop
+ * [lint] get rid of consider-iterating-dictionary
+ * [lint] get rid of invalid-name for variables m and t
+ * [dist] Adding spec file to git
+ * [lint] fix constant invalid-name
+ * [lint] cleanup for pylint-2.7 for tests/test.py
+ * [lint] cleanup for TarSCM/__init__.py
+ * [lint] cleanup for tar_scm.py
+ * [lint] cleanup tests/tasks.py
+ * [lint] cleanup tests/utils.py
+ * [lint] cleanup tests/scmlogs.py
+ * [lint] cleanup tests/commontests.py relative-import
+
+ [ Bernhard M. Wiedemann ]
+ * Sort tar file list
+
+ [ Frank Schreiner ]
+ * finalize method for TarSCM.scm.* classes
+ * [lint] pylint fixes for TarSCM.scm.tar
+ * [lint] pylint fixes for TarSCM/scm/base.py
+ * new version placeholder for empty version string
+ * [lint] commontests.py: rename th/ti
+ * [lint] commontests.py: remove unused variables
+ * [lint] commontest.py: fix invalid-name for methods
+ * [lint] revert ret changes
+ * [lint] rename classes in TarSCM/archive.py
+ * [lint] more cleanup for TarSCM/archive.py
+ * [lint] rename class changes -> Changes in TarSCM/changes.py
+ * [lint] more cleanup in TarSCM/changes.py
+ * changed mode TarSCM/changes.py 755 -> 644
+ * [lint] rename class cli -> Cli in TarSCM/cli.py
+ * [lint] more cleanup for TarSCM/cli.py
+ * [lint] rename class config -> Config in TarSCM/config.py
+ * [lint] more cleanup in TarSCM/config.py
+ * [lint] rename class helpers -> Helpers in TarSCM/helpers.py
+ * [lint] rename class tasks -> Tasks in TarSCM/tasks.py
+ * [lint] rename class scm -> Scm in TarSCM/scm/base.py
+ * [ci] fix for bzr locale problem
+ * [lint] renamed class bzr -> Bzr in TarSCM/scm/bzr.py
+ * [lint] cleanup TarSCM.scm.bzr
+ * [lint] cleanup for TarSCM/tasks.py
+ * [lint] rename class git -> Git in TarSCM/scm/git.py
+ * [lint] cleanup for TarSCM.scm.git
+ * [lint] rename hg -> Hg in TarSCM/scm/hg.py
+ * [lint] cleanup TarSCM.scm.hg
+ * [lint] rename class svn -> Svn in TarSCM/scm/svn.py
+ * [lint] cleanup for TarSCM/scm/svn.py
+ * [lint] rename class tar -> Tar TarSCM/scm/tar.py
+ * [lint] added .pylintrc and pylint req
+
+ [ Adam Spiers ]
+ * [lint] tweak default pylint configuration
+
+ [ Frank Schreiner ]
+ * [ci] make pep8, pylint and flake8 optional ...
+ * [dist] changed to %py_compile in spec file
+ * [bugfix] fixes issue #173
+ * [bugfix] Decoupled self.scm from class name in TarSCM/scm/*
+ * [lint] make tests/unittestcases.py flake8 ready
+ * [lint] more fixes for pylint readiness
+ * [lint] refactor unittestcases.py
+ * [test] increase cov for TarSCM.archive from 61% to 92%
+ * [doc] added comment to --use-obs-scm
+ * [test] refactor of fake classes
+ * [bugfix] fix UnboundLocalError: local variable 'parent_tag'
+ * [dist] fix spec file py_compile for fedora
+
+ [ Bernhard M. Wiedemann ]
+ * Sort cpio file list
+ * also override timestamps of files in cpio
+ * change ordering so that latest change is on top
+
+ [ Nicolas Morey-Chaisemartin ]
+ * git: Support url change
+
+ [ Adrian Schröter ]
+ * mention _none_ version string for people who need it for kiwi root
+ archives for example
+
+ [ Adam Spiers ]
+ * wrap long lines in README
+ * acknowledge deficiencies in dev docs
+ * fix docstring typo in TarSCM.scm.tar.fetch_upstream
+ * fix reference to snapcraft YAML file
+
+ [ Frank Schreiner ]
+ * fix for broken links
+ * new cli option --skip-cleanup
+ * changed PREFIX in Gnumakefile to /usr
+ * fix broken tests for broken-links
+ * fix broken test create_archive
+ * reactivate test_obscpio_extract_d
+
+ [ Dirk Mueller ]
+ * Only use current dir if it actually looks like git (Fixes #202)
+ * Cleanup flake8 checks
+
+ [ Luca Boccassi ]
+ * Refactor and simplify git prepare_working_copy
+ * Git clone with --no-checkout in prepare_working_copy
+
+ [ Adam Spiers ]
+ * add a lot more detail to README
+
+ [ doccaz ]
+ * [backend] Adding http proxy support
+ * missing import for logging functions.
+ * fixing flake8 warnings, missing imports
+ * fixing indentation warnings from flake8
+
+ [ Frank Schreiner ]
+ * make installation of scm's optional
+
+ [ doccaz ]
+ * Removing redundant pass statement
+
+ [ Kai Pastor ]
+ * Fix parameter descriptions
+
+ [ Adrian Schröter ]
+ * move python-unittest2 dep to test suite only part (submission by olh)
+
+ [ Olaf Hering ]
+ * python-unittest2 is only required for the optional make check
+
+ [ Frank Schreiner ]
+ * Remove clone_dir if clone fails
+
+ [ Adrian Schröter ]
+ * [dist] fix build for distros not yet supporting Recommends tag
+
+ [ Adam Spiers ]
+ * add stub user docs in lieu of something proper (#238)
+ * don't allow DEBUG_TAR_SCM to change behaviour (#240)
+ * sort imports
+ * only do git stash save/pop if we have a non-empty working tree (#228)
+
+ [ Frank Schreiner ]
+ * improve handling of corrupt git cache directories
+
+ [ Giovanni Santini ]
+ * Allow metadata packing for CPIO archives when desired As of now,
+ metadata are always excluded from *obscpio* packages. This is because
+ the *package-metadata* flag is ignored; this change (should) make
+ *obscpio* aware of it.
+ * Adding information regarding the *package-metadata* option for the
+ *tar* service The tar service is highly useful in combination with the
+ *obscpio* service. After the fix for the metadata for the latter one,
+ it is important to inform the users of the *tar* service that metadata
+ is kept only if the flag *package-metadata* is enabled. Add the flag
+ to the .service file for mentioning that.
+
+ [ Frank Schreiner ]
+ * changed os.removedirs -> shutil.rmtree
+ * check --extract file path for parent dir
+
+ [ Adrian Schröter ]
+ * run download_files in appimage and snapcraft case
+
+ [ Frank Schreiner ]
+ * disable follow_symlinks in extract feature
+ * check filename for slashes
+ * check symlinks in subdir parameter
+ * check url for remote url
+ * check name/version option in obsinfo for slashes
+
+ [ Daniel Gollub ]
+ * Support also SSH urls for Git
+
+ [ Frank Schreiner ]
+ * fix regression from 44b3bee
+
+ [ Adrian Schröter ]
+ * fix flake warning
+ * create reproducible obscpio archives
+
+ [ Frank Schreiner ]
+ * fix check for "--reproducible"
+ * split pylint2 in GNUmakefile
+ * cleanup for pylint and flake8
+ * enable flake8 in hound
+
+ [ Jellyfrog ]
+ * Add support for extract globbing
+
+ [ Frank Schreiner ]
+ * make code python3 ready
+ * remove hardcoded utf-8 encodings
+ * change pylint/flake8 back to 2.7 for now
+ * revert encoding for old changes file
+ * fix encoding issues if commit message contains utf8 char
+ * fix problems with unicode characters in commit messages for
+ changeloggenerate
+ * reuse _service*_servicedata/changes files from previous service runs
+ * fix bug with unicode filenames in prep_tree_for_archive
+ * Another attempt to fix unicode filenames in prep_tree_for_archive
+ * Another attempt to fix unicode filenames in prep_tree_for_archive
+ * Final fix for unicode in filenames
+ * another fix for unicode problem in obs_scm
+ * cleanup for broken svn caches
+ * added glibc as Recommends in spec file
+ * separate service file installation in GNUmakefile
+ * added new param '--locale'
+ * check encoding problems for svn and print proper error msg
+ * [dist] fix service files installation in Makefile
+
+ [ Adrian Schröter ]
+ * sync spec file as used in openSUSE:Tools project
+ * allow submodule and ssl options in appimage
+ * move argparse dep to -common package
+
+ [ Jan Engelhardt ]
+ * Stop using @opensuse.org addresses to indicate a missing address
+
+ [ Frank Schreiner ]
+ * removed python 2.6 from travis
+ * raise exception if no changesauthor given
+ * added logging for better debugging changesgenerate
+
+ [ Adrian Schröter ]
+ * add python 3.6 and 3.7 to testing
+
+ [ Frank Schreiner ]
+ * move to python3
+ * fix spec for RH/Fedora - glibc-locale -> glibc-common
+ * fix unicode in containers
+ * more fixes py3 unicode
+ * better encoding handling
+ * added python-six to Requires in specfile
+ * fix problems with unicode source files
+ * added KankuFile
+
+ [ Marcus Rückert ]
+ * Prefer UTF-8 locale as output format for changes
+
+ [ Frank Schreiner ]
+ * enforce bytes for cpio file list
+
+ [ Marcus Rückert ]
+ * Require packages to get the en_US.UTF-8 locales
+ * Forgot the guard 0 in one conditional
+ * Fix the logic to pick the locale package on Fedora
+ * Minimize diff with the version in openSUSE:Tools
+ * centos_version and rhel_version are triple digits
+ * Git also uses the LANGUAGE variable
+
+ [ Frank Schreiner ]
+ * [dist] spec file: python3 only and multidist
+ * predefine python version in spec file for GNUMAkefile
+
+ [ Marcus Rückert ]
+ * More thorought spec file cleanup
+
+ [ Frank Schreiner ]
+ * change order in GNUMakefile to prefer python3
+
+ [ Marcus Rückert ]
+ * Compile python files before install
+ * glibc-common was used up to FC23 and RHEL7
+
+ [ Frank Schreiner ]
+ * fix encoding error for surrogates
+ * [dist] enable python3 in SLE >= 12
+ * [dist] python3 for SLE12 and openSUSE 42.3
+ * disabling hg tests in travis
+ * Don`t break testsuite if cwd contains colons
+
+ [ Jiri Slaby ]
+ * tar_scm.service: fix exclude documentation
+ * git: really print the error message
+
+ [ Frank Schreiner ]
+ * separate language and encoding
+
+ [ Egbert Eich ]
+ * Append '_service' to repository directory
+ * Fix unit tests for modified scm directory handling
+ * Make service 'tar' work with a cachedir as well
+
+ [ Frank Schreiner ]
+ * Revert "Merge pull request #323 from e4t/master"
+
+ [ Jonathan Brielmaier ]
+ * tar_scm.service.in: Add example to match-tag.
+
+ [ Frank Schreiner ]
+ * fetch rev explicitly if using CACHEDIRECTORY and rev could not be
+ found
+ * added UnicodeDecodeError to exeption list in archive.py
+ * prefer local branch over remote
+ * update_cache in git now does merge
+
+ [ lethliel ]
+ * fix decoding for locale -a containg non-ASCII
+
+ [ Julio Gonzalez Gil ]
+ * Re-enable compatibility with Python 2.6
+
+ [ Jeremy JACQUE ]
+ * Implement git LFS blobs retrieval
+ * Add debian package dep to git-lfs
+
+ [ Guang Yee ]
+ * Fix --mirror argument position for git clone
+
+ [ Duncan Mac-Vicar P ]
+ * Handle missing build entry in appimage.yml
+ * Add testcase for appimage with empty build section
+
+ [ Frank Schreiner ]
+ * improved comment for method get_changesrevision
+ * call git stash with LANG=C
+
+ [ Luca Boccassi ]
+ * Add new archive option for Debian: git-buildpackage
+ * Version cleanup: don't strip hyphen when building Debian packages
+ * Document _none_ special version in .service
+
+ [ Jeremy Jacque ]
+ * Allow use of git-lfs only when running obs_scm
+ * git-lfs should not be mandatory as tar_scm will never use it
+
+ [ Jeremy JACQUE ]
+ * Add the credential-key parameter to service file
+ * Add the credential-key parameter to the cli
+ * Read credentials from (default) config file
+ * Modify url with credentials for Bazaar SCM
+ * Modify url with credentials for Git SCM
+ * Modify url with credentials for Mercurial SCM
+ * Use cli params to set credentials for Subversion SCM
+ * Disable flake8 W503 that should no exist anymore
+ * Use re.match instead of fullmatch cause it does not exist in Python2
+ version
+ * Raise exception if missing/malformed credentials in config file
+ * Fix tests by adding the new credential_key param
+ * Try to fix flake8-black warning
+ * Change auth param to use keyring-passphrase/user
+ * Read credentials from keyring
+ * Add new auth params to tests
+ * Add python keyring and keyrings.alt requirements
+ * Fix typos
+ * Fix description: wrong unix user when running keyring
+
+ [ Adrian Schröter ]
+ * fix breakage when working on a specific tag/commit
+ * fix lost commits on local run
+
+ [ Frank Schreiner ]
+ * Remove hard dependencies to keyring modules
+
+ [ Jeremy JACQUE ]
+ * Add python keyring as recommended in debian control
+ * Use XDG_DATA_HOME env variable to store keyring in
+ /etc/obs/services/tar_scm.d/
+ * Deduplicate code by moving it to auth_url function
+ * Fix some pylint/flake issues
+ * Fix keyring command line example
+ * Fix owner of the directory of python keyring
+ * Add a small debugging to auth_url
+ * Fix line too long on debug logging
+
+ [ Adrian Schröter ]
+ * simplify osc git update case a lot
+
+ [ Frank Schreiner ]
+ * fixing flake8/pep8 error for python2.7
+
+ [ Adrian Schröter ]
+ * report invalid tag/revsion/branch specified
+
+ [ Frank Schreiner ]
+ * re-enabled W503 in flake8
+
+ -- Luca Boccassi <[email protected]> Sat, 18 Apr 2020 16:23:54 +0100
+
obs-service-tar-scm (0.5.0) unstable; urgency=low
* change default git versionformat to %ct.%h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/dist/obs-service-tar_scm.spec
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/dist/obs-service-tar_scm.spec
---
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/dist/obs-service-tar_scm.spec
2020-03-17 17:43:03.000000000 +0100
+++
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/dist/obs-service-tar_scm.spec
2020-05-07 11:14:39.000000000 +0200
@@ -16,12 +16,24 @@
#
-%if 0%{?suse_version} && 0%{?suse_version} >= 1220
+%define flavor @BUILD_FLAVOR@%nil
+%if "%{flavor}" == ""
+%define nsuffix %nil
+%else
+%define nsuffix -test
+%endif
+
+%if 0%{?suse_version} && 0%{?suse_version} >= 1220 && "%{flavor}" == "test"
%bcond_without obs_scm_testsuite
%else
%bcond_with obs_scm_testsuite
%endif
+# special guard for flavor test, yet --without test being specified
+%if "%{flavor}" == "test" && %{without obs_scm_testsuite}
+ExclusiveArch: skip-build
+%endif
+
%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29
%bcond_without python3
%else
@@ -84,20 +96,23 @@
Recommends: mercurial \
Recommends: subversion \
Recommends: obs-service-download_files \
+Recommends: %{use_python}-keyring \
+Recommends: %{use_python}-keyrings.alt \
%endif \
%{nil}
######## END OF MACROS AND FUN ###################################
-Name: obs-service-tar_scm
-%define version_unconverted 0.10.14.1583853599.ccbb399
-Version: 0.10.14.1583853599.ccbb399
+%define pkg_name obs-service-tar_scm
+Name: %{pkg_name}%{nsuffix}
+%define version_unconverted 0.10.15.1588146746.5cfeeb8
+Version: 0.10.15.1588146746.5cfeeb8
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
Group: Development/Tools/Building
URL: https://github.com/openSUSE/obs-service-tar_scm
-Source: %{name}-%{version}.tar.gz
+Source: %{pkg_name}-%{version}.tar.gz
# Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
# based distributions
@@ -105,6 +120,9 @@
%if %{with obs_scm_testsuite}
BuildRequires: %{locale_package}
+BuildRequires: %{pkg_name} = %{version}
+BuildRequires: %{use_python}-keyring
+BuildRequires: %{use_python}-keyrings.alt
BuildRequires: %{use_python}-mock
BuildRequires: %{use_python}-six
BuildRequires: %{use_python}-unittest2
@@ -124,7 +142,7 @@
BuildRequires: %{use_python}-lxml
%if %{with python3}
-BuildRequires: %{use_python}
+BuildRequires: %{use_python}-base
# Fix missing Requires in python3-pbr in Leap42.3
BuildRequires: %{use_python}-setuptools
%else
@@ -222,9 +240,10 @@
%build
%install
+%if %{without obs_scm_testsuite}
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}"
-%if %{with obs_scm_testsuite}
+%else
# moved conditional to the top as it helps to have it all in one place and
only rely on the bcond_with here.
%check
# No need to run PEP8 tests here; that would require a potentially
@@ -233,6 +252,7 @@
make %{use_test}
%endif
+%if %{without obs_scm_testsuite}
%files
%defattr(-,root,root)
%{_prefix}/lib/obs/service/tar_scm.service
@@ -245,7 +265,7 @@
%{_prefix}/lib/obs/service/tar_scm
%dir %{_sysconfdir}/obs
%dir %{_sysconfdir}/obs/services
-%attr(-,obsservicerun,obsrun) %dir %{_sysconfdir}/obs/services/tar_scm.d
+%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
%config(noreplace) %{_sysconfdir}/obs/services/*
%files -n obs-service-tar
@@ -271,5 +291,6 @@
%defattr(-,root,root)
%{_prefix}/lib/obs/service/obs_gbp*
%endif
+%endif
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/tar_scm.service.in
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/tar_scm.service.in
--- old/obs-service-tar_scm-0.10.14.1584463383.06b0455/tar_scm.service.in
2020-03-17 17:43:03.000000000 +0100
+++ new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/tar_scm.service.in
2020-05-07 11:14:39.000000000 +0200
@@ -45,7 +45,8 @@
<parameter name="keyring-passphrase">
<description>
Specify the passphrase to decrypt credentials from the python keyring.
- To store credentials please use the following command line:
+ To store credentials please use the following command lines:
+ "sudo chown obsservicerun:obsrun /etc/obs/services/tar_scm.d"
"sudo -H -u obsservicerun XDG_DATA_HOME=/etc/obs/services/tar_scm.d
keyring -b keyrings.alt.file.EncryptedKeyring set URL username"
Its only available for the following combinaison of SCM / protocols:
- git: ftp(s),http(s)
@@ -143,6 +144,8 @@
refs/changes/49/11249/1
- set by: git fetch ${url} ${revision}:${revision}
git checkout ${revision}
+
+ * the first tag that is reachable via git describe on the default
branch: @PARENT_TAG@
</description>
</parameter>
<parameter name="filename">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/tests/gittests.py
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/tests/gittests.py
--- old/obs-service-tar_scm-0.10.14.1584463383.06b0455/tests/gittests.py
2020-03-17 17:43:03.000000000 +0100
+++ new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/tests/gittests.py
2020-05-07 11:14:39.000000000 +0200
@@ -358,3 +358,10 @@
clone_url, clone_dir]
self.assertEqual(expected_command, command)
+ def test_revision_latest_tag(self):
+ fix = self.fixtures
+ fix.create_commit(fix.wd)
+ fix.create_commit(fix.wd)
+ self.tar_scm_std("--revision", "@PARENT_TAG@")
+ self.assertTarOnly(self.basename(version="1234567890." +
+ fix.sha1s[fix.wd]["tag2"][:7]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.14.1584463383.06b0455/tests/unittestcases.py
new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/tests/unittestcases.py
--- old/obs-service-tar_scm-0.10.14.1584463383.06b0455/tests/unittestcases.py
2020-03-17 17:43:03.000000000 +0100
+++ new/obs-service-tar_scm-0.10.15.1588842879.5c43eef/tests/unittestcases.py
2020-05-07 11:14:39.000000000 +0200
@@ -78,7 +78,7 @@
six.assertRaisesRegex(
self,
SystemExit,
- re.compile(r"Command failed\(1\): ''"),
+ re.compile(r"Command /bin/false failed\(1\): ''"),
helpers.safe_run,
"/bin/false",
cwd=None,
