Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2016-09-12 13:25:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-08-29 15:42:18.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes
2016-09-12 13:25:28.000000000 +0200
@@ -1,0 +2,57 @@
+Wed Aug 31 15:26:51 UTC 2016 - [email protected]
+
+- Update to version 0.6.1.1472657181.ff9a5ca:
+ * make yaml dependency optional for travis
+ * Add an option 'master' to submodules to fetch the latest mater branch.
+ * tar_scm.py: Always use an absolute path for the 'output' directory
+ * 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
+
+-------------------------------------------------------------------
+Wed Aug 31 15:10:37 UTC 2016 - [email protected]
+
+- Update to version 0.6.1.1472656157.58c52d8:
+ * make yaml dependency optional for travis
+ * Add an option 'master' to submodules to fetch the latest mater branch.
+ * tar_scm.py: Always use an absolute path for the 'output' directory
+ * 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
+
+-------------------------------------------------------------------
+Wed Aug 31 14:55:10 UTC 2016 - [email protected]
+
+- Update to version 0.6.1.1472655284.4930b81:
+ * add python-dateutil require for debian
+ * testing on debian is broken atm
+
+-------------------------------------------------------------------
+Wed Aug 31 09:53:37 UTC 2016 - [email protected]
+
+- fix debian builds
+
+-------------------------------------------------------------------
+Wed Aug 31 09:53:23 UTC 2016 - [email protected]
+
+- Update to version 0.6.1.1472636708.355b59a:
+ * fix some more merge regressions
+ * pep8 fixes/workarounds
+ * make yaml dependency optional for travis
+ * Add an option 'master' to submodules to fetch the latest mater branch.
+ * tar_scm.py: Always use an absolute path for the 'output' directory
+ * 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
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.6.1.1471594222.d257927.tar.gz
New:
----
obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.73kzfg/_old 2016-09-12 13:25:29.000000000 +0200
+++ /var/tmp/diff_new_pack.73kzfg/_new 2016-09-12 13:25:29.000000000 +0200
@@ -20,18 +20,18 @@
%define seperate_build 0
%if "%seperate_build" == "1"
-%define version_unconverted 0.6.1.1471594222.d257927
+%define version_unconverted 0.6.1.1472657181.ff9a5ca
Name: obs-service-obs_scm
%else
-%define version_unconverted 0.6.1.1471594222.d257927
+%define version_unconverted 0.6.1.1472657181.ff9a5ca
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.6.1.1471594222.d257927
+Version: 0.6.1.1472657181.ff9a5ca
Release: 0
Summary: An OBS source service: checkout or update a tar ball from
svn/git/hg
License: GPL-2.0+
++++++ 0001-Debianization-disable-running-mercurial-tests.patch ++++++
--- /var/tmp/diff_new_pack.73kzfg/_old 2016-09-12 13:25:29.000000000 +0200
+++ /var/tmp/diff_new_pack.73kzfg/_new 2016-09-12 13:25:29.000000000 +0200
@@ -14,19 +14,6 @@
tests/test.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/debian/control b/debian/control
-index a45fa04..6f3551d 100644
---- a/debian/control
-+++ b/debian/control
-@@ -2,7 +2,7 @@ Source: obs-service-tar-scm
- Section: devel
- Priority: extra
- Maintainer: Daniel Gollub <[email protected]>
--Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, pep8, python (>=
2.6), python-argparse | python (>= 2.7), python-unittest2, subversion
-+Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6),
python-argparse | python (>= 2.7), python-unittest2, subversion
- Standards-Version: 3.9.3
- Homepage: https://github.com/openSUSE/obs-service-tar_scm
- X-Python-Version: >= 2.6
diff --git a/tests/test.py b/tests/test.py
index 3814e71..ca480b7 100755
--- a/tests/test.py
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.73kzfg/_old 2016-09-12 13:25:29.000000000 +0200
+++ /var/tmp/diff_new_pack.73kzfg/_new 2016-09-12 13:25:29.000000000 +0200
@@ -1,6 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/adrianschroeter/obs-service-tar_scm.git</param>
- <param
name="changesrevision">309b68f96203645af093c0c2285655f2cf8f1aee</param></service><service
name="tar_scm">
- <param
name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param
name="changesrevision">49c9462599650ab6a6d122b9156c732187cf99ea</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">ff9a5ca9d38691524048733ec6d070bfba6d4747</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.73kzfg/_old 2016-09-12 13:25:29.000000000 +0200
+++ /var/tmp/diff_new_pack.73kzfg/_new 2016-09-12 13:25:29.000000000 +0200
@@ -1,9 +1,19 @@
Format: 1.0
-Source: obs-service-tar_scm
-Version: 0.5.0
+Source: obs-service-tar-scm
+Version: 0.6.1
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 7), bzr, git, python (>= 2.6), python-argparse |
python (>= 2.7), subversion, python-unittest2, pep8, python-lxml
+Build-Depends: debhelper (>= 8.0.0), python (>= 2.6), python-argparse | python
(>= 2.7), python-dateutil
+
+Package: obs-service-tar-scm
+Architecture: all
+Provides: obs-service-obs-scm, obs-service-tar
+Depends: ${misc:Depends}, ${python:Depends}, bzr, git, subversion, cpio,
python-dateutil
+Recommends: mercurial
+Description: An OBS source service: fetches SCM tarballs
+ This is a source service for openSUSE Build Service.
+ It supports downloading from svn, git, hg and bzr repositories.
+
++++++ obs-service-tar_scm-0.6.1.1471594222.d257927.tar.gz ->
obs-service-tar_scm-0.6.1.1472657181.ff9a5ca.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.6.1.1471594222.d257927/debian/control
new/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca/debian/control
--- old/obs-service-tar_scm-0.6.1.1471594222.d257927/debian/control
2016-08-19 10:10:22.000000000 +0200
+++ new/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca/debian/control
2016-08-31 17:26:21.000000000 +0200
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Daniel Gollub <[email protected]>
-Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, pep8, python (>=
2.6), python-argparse | python (>= 2.7), python-dateutil, python-unittest2,
subversion
+Build-Depends: debhelper (>= 7.0.0), python (>= 2.6), python-argparse | python
(>= 2.7), python-dateutil
Standards-Version: 3.9.3
Homepage: https://github.com/openSUSE/obs-service-tar_scm
X-Python-Version: >= 2.6
@@ -10,7 +10,8 @@
Package: obs-service-tar-scm
Architecture: all
Provides: obs-service-obs-scm, obs-service-tar
-Depends: ${misc:Depends}, ${python:Depends}, bzr, git, mercurial, subversion,
cpio
+Depends: ${misc:Depends}, ${python:Depends}, bzr, git, subversion, cpio,
python-dateutil
+Recommends: mercurial
Description: An OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.6.1.1471594222.d257927/debian/rules
new/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca/debian/rules
--- old/obs-service-tar_scm-0.6.1.1471594222.d257927/debian/rules
2016-08-19 10:10:22.000000000 +0200
+++ new/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca/debian/rules
2016-08-31 17:26:21.000000000 +0200
@@ -9,5 +9,7 @@
override_dh_auto_build: ;
+override_dh_auto_test: ;
+
override_dh_auto_install:
$(MAKE) DESTDIR=`pwd`/$(DESTDIR) PREFIX=/usr install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.6.1.1471594222.d257927/tar_scm.py
new/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca/tar_scm.py
--- old/obs-service-tar_scm-0.6.1.1471594222.d257927/tar_scm.py 2016-08-19
10:10:22.000000000 +0200
+++ new/obs-service-tar_scm-0.6.1.1472657181.ff9a5ca/tar_scm.py 2016-08-31
17:26:21.000000000 +0200
@@ -40,38 +40,6 @@
DEFAULT_AUTHOR = '[email protected]'
-def setup_tracking_branches(git_dir):
- output = subprocess.Popen(["git", "-C", git_dir, "branch", "-a"],
stdout=subprocess.PIPE).communicate()[0]
-
- p = re.compile('.* ->\s+(.*)')
- p2 = re.compile('.?\s*((remotes/(.*)/)?(.+))')
-
- remote_branches = {}
- local_branches = {}
- local2remove = {}
-
- for line in output.split("\n"):
- m = p.match(line)
- if not m:
- m2 = p2.match(line)
- if m2:
- if m2.group(2):
- if m2.group(3) == 'origin':
- remote_branches[m2.group(4)] = m2.group(1)
- else:
- local_branches[m2.group(4)] = 1
-
- for branch in local_branches:
- try:
- del remote_branches[branch]
- except KeyError:
- local2remove[branch] = 1
-
- for branch in remote_branches:
- subprocess.Popen(["git", "-C", git_dir, "branch", "--track", branch,
remote_branches[branch]], stdout=subprocess.PIPE)
-
- for branch in local2remove:
- subprocess.Popen(["git", "-C", git_dir, "branch", "-D", branch])
def run_cmd(cmd, cwd, interactive=False, raisesysexit=False):
"""Execute the command cmd in the working directory cwd and check return
@@ -132,38 +100,15 @@
def fetch_upstream_git(url, clone_dir, revision, cwd, kwargs):
"""Fetch sources via git."""
- if kwargs['jailed']:
- reponame = url.split('/')[-1];
- clone_cache_dir = os.path.join(kwargs['cachedir'],reponame)
- if not os.path.isdir(os.path.join(clone_cache_dir,'.git')):
- # clone if no .git dir exists
- command = ['git', 'clone', '--no-checkout', url, clone_cache_dir]
- if not is_sslverify_enabled(kwargs):
- command += ['--config', 'http.sslverify=false']
- else:
- # "git fetch" is a blocking command
- # so no race conditions should occur between multiple service
processes
- command = ['git', '-C', clone_cache_dir, 'fetch', '--tags',
'--prune']
-
- safe_run(command, cwd=cwd, interactive=sys.stdout.isatty())
-
- setup_tracking_branches(clone_cache_dir)
-
- # We use a temporary shared clone to avoid race conditions
- # between multiple services
- safe_run(['git','clone','--shared',clone_cache_dir,clone_dir],
cwd=cwd, interactive=sys.stdout.isatty())
-
- else:
- command = ['git', 'clone', url, clone_dir]
-
- if not is_sslverify_enabled(kwargs):
- command += ['--config', 'http.sslverify=false']
- safe_run(command, cwd=cwd, interactive=sys.stdout.isatty())
- # if the reference does not exist.
- if revision and not git_ref_exists(clone_dir, revision):
- # fetch reference from url and create locally
- safe_run(['git', 'fetch', url, revision + ':' + revision],
- cwd=clone_dir, interactive=sys.stdout.isatty())
+ command = ['git', 'clone', url, clone_dir]
+ if not is_sslverify_enabled(kwargs):
+ command += ['--config', 'http.sslverify=false']
+ safe_run(command, cwd=cwd, interactive=sys.stdout.isatty())
+ # if the reference does not exist.
+ if revision and not git_ref_exists(clone_dir, revision):
+ # fetch reference from url and create locally
+ safe_run(['git', 'fetch', url, revision + ':' + revision],
+ cwd=clone_dir, interactive=sys.stdout.isatty())
def fetch_upstream_git_submodules(clone_dir, kwargs):
@@ -349,8 +294,6 @@
def fetch_upstream(scm, url, revision, out_dir, **kwargs):
"""Fetch sources from repository and checkout given revision."""
- logging.debug("CACHEDIR: '%s'" % kwargs['cachedir'])
- logging.debug("JAILED: '%d'" % kwargs['jailed'])
clone_prefix = ""
if 'clone_prefix' in kwargs:
clone_prefix = kwargs['clone_prefix']
@@ -1205,9 +1148,6 @@
help='osc service parameter for internal use only '
'(determines where generated files go before '
'collection')
- parser.add_argument('--jailed', required=False, type=int, default=0,
- help='service parameter for internal use only '
- '(determines whether service runs in docker
jail)')
parser.add_argument('--history-depth',
help='Obsolete osc service parameter that does '
'nothing')
@@ -1217,6 +1157,7 @@
if not os.path.isdir(args.outdir):
sys.exit("%s: No such directory" % args.outdir)
+ args.outdir = os.path.abspath(args.outdir)
orig_subdir = args.subdir
args.subdir = os.path.normpath(orig_subdir)
if args.subdir.startswith('/'):
@@ -1322,23 +1263,22 @@
repocachedir = get_repocachedir()
repodir = None
- if not args.jailed:
- # construct repodir (the parent directory of the checkout)
- if repocachedir and os.path.isdir(repocachedir):
- # construct subdirs on very first run
- if not os.path.isdir(os.path.join(repocachedir, 'repo')):
- os.mkdir(os.path.join(repocachedir, 'repo'))
- if not os.path.isdir(os.path.join(repocachedir, 'incoming')):
- os.mkdir(os.path.join(repocachedir, 'incoming'))
-
- repohash = get_repocache_hash(args.scm, args.url, args.subdir)
- logging.debug("HASH: %s", repohash)
- repodir = os.path.join(repocachedir, 'repo')
- repodir = os.path.join(repodir, repohash)
-
- # if caching is enabled but we haven't cached something yet
- if repodir and not os.path.isdir(repodir):
- repodir = tempfile.mkdtemp(dir=os.path.join(repocachedir,
'incoming'))
+ # construct repodir (the parent directory of the checkout)
+ if repocachedir and os.path.isdir(repocachedir):
+ # construct subdirs on very first run
+ if not os.path.isdir(os.path.join(repocachedir, 'repo')):
+ os.mkdir(os.path.join(repocachedir, 'repo'))
+ if not os.path.isdir(os.path.join(repocachedir, 'incoming')):
+ os.mkdir(os.path.join(repocachedir, 'incoming'))
+
+ repohash = get_repocache_hash(args.scm, args.url, args.subdir)
+ logging.debug("HASH: %s", repohash)
+ repodir = os.path.join(repocachedir, 'repo')
+ repodir = os.path.join(repodir, repohash)
+
+ # if caching is enabled but we haven't cached something yet
+ if repodir and not os.path.isdir(repodir):
+ repodir = tempfile.mkdtemp(dir=os.path.join(repocachedir, 'incoming'))
if repodir is None:
repodir = tempfile.mkdtemp(dir=args.outdir)
@@ -1365,7 +1305,7 @@
# not need in case of local osc build
os.rename(basename, clone_dir)
else:
- clone_dir = fetch_upstream(out_dir=repodir,cachedir=repocachedir,
**args.__dict__)
+ clone_dir = fetch_upstream(out_dir=repodir, **args.__dict__)
if args.filename:
dstname = basename = args.filename
