Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2015-08-28 08:26:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2015-08-05 06:52:04.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2015-08-28 08:26:34.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Aug 19 09:26:48 UTC 2015 - [email protected]
+
+- Update to version 0.5.2:
+ + - make test suite happy
+
+-------------------------------------------------------------------
+Mon Aug 17 15:14:11 UTC 2015 - [email protected]
+
+- Update to version 0.5.2:
+ + fix it ... it only worked with "disabledrun" mode by luck
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.5.1.tar.gz
New:
----
obs-service-set_version-0.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.T6VdmP/_old 2015-08-28 08:26:34.000000000 +0200
+++ /var/tmp/diff_new_pack.T6VdmP/_new 2015-08-28 08:26:34.000000000 +0200
@@ -19,7 +19,7 @@
%define service set_version
Name: obs-service-%{service}
-Version: 0.5.1
+Version: 0.5.2
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0+
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.T6VdmP/_old 2015-08-28 08:26:34.000000000 +0200
+++ /var/tmp/diff_new_pack.T6VdmP/_new 2015-08-28 08:26:34.000000000 +0200
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-set_version.git</param>
- <param
name="changesrevision">c8e7ae6db4619249d226b3cad8151471da6b6de0</param></service>
+ <param
name="changesrevision">e5b43d3e1562c436fc017536844b93ffbf6193ee</param></service>
</servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.T6VdmP/_old 2015-08-28 08:26:34.000000000 +0200
+++ /var/tmp/diff_new_pack.T6VdmP/_new 2015-08-28 08:26:34.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-set-version
-Version: 0.5.1
+Version: 0.5.2
Binary: obs-service-set-version
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
++++++ obs-service-set_version-0.5.1.tar.gz ->
obs-service-set_version-0.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.1/set_version
new/obs-service-set_version-0.5.2/set_version
--- old/obs-service-set_version-0.5.1/set_version 2015-07-28
08:17:48.000000000 +0200
+++ new/obs-service-set_version-0.5.2/set_version 2015-08-19
11:26:48.000000000 +0200
@@ -33,6 +33,7 @@
HAS_PACKAGING = True
+outdir = None
suffixes = ('tar', 'tar.gz', 'tgz', 'tar.bz2', 'tbz2', 'tar.xz', 'zip')
suffixes_re = "|".join(map(lambda x: re.escape(x), suffixes))
@@ -146,9 +147,7 @@
def _add_or_replace_define(filename, def_name, def_value):
# first, modify a copy of filename and then move it
- filename_new = ".%s" % filename
- shutil.copy(filename, filename_new)
- with open(filename_new, 'r+') as f:
+ with open(filename, 'r+') as f:
contents = f.read()
f.seek(0)
contents_new, subs = re.subn(
@@ -167,14 +166,11 @@
f.truncate()
f.write(contents_new)
- os.rename(filename_new, filename)
def _replace_spec_setup(filename, version_define):
# first, modify a copy of filename and then move it
- filename_new = ".%s" % filename
- shutil.copy(filename, filename_new)
- with open(filename_new, 'r+') as f:
+ with open(filename, 'r+') as f:
contents = f.read()
f.seek(0)
# %setup without "-n" uses implicit "-n" as "%{name}-%{version}"
@@ -193,14 +189,11 @@
if subs > 0:
f.truncate()
f.write(contents_new)
- os.rename(filename_new, filename)
def _replace_tag(filename, tag, string):
# first, modify a copy of filename and then move it
- filename_new = ".%s" % filename
- shutil.copy(filename, filename_new)
- with open(filename_new, 'r+') as f:
+ with open(filename, 'r+') as f:
contents = f.read()
f.seek(0)
if filename.endswith("PKGBUILD"):
@@ -217,24 +210,20 @@
if subs > 0:
f.truncate()
f.write(contents_new)
- os.rename(filename_new, filename)
def _replace_debian_changelog_version(filename, version_new):
# first, modify a copy of filename and then move it
- filename_new = ".%s" % filename
- shutil.copy(filename, filename_new)
# get current version
version_current = VersionDetector._get_version_via_debian_changelog(
- filename_new)
- with open(filename_new, 'r+') as f:
+ filename)
+ with open(filename, 'r+') as f:
content_lines = f.readlines()
f.seek(0)
content_lines[0] = content_lines[0].replace(
version_current, version_new, 1)
f.truncate()
f.writelines(content_lines)
- os.rename(filename_new, filename)
def _version_python_pip2rpm(version_pip):
@@ -302,6 +291,12 @@
files_local = _get_local_files()
+ outdir = args['outdir']
+
+ if not outdir:
+ print "no outdir specified"
+ sys.exit(-1)
+
if not version:
version = VersionDetector._autodetect(files_local, args["basename"])
@@ -319,22 +314,30 @@
# handle rpm specs
for f in filter(lambda x: x.endswith(".spec"), files):
+ filename = outdir + "/" + f
+ shutil.copyfile(f, filename)
if version_converted and version_converted != version:
- _replace_tag(f, 'Version', version_converted)
- _add_or_replace_define(f, "version_unconverted", version)
- _replace_spec_setup(f, "version_unconverted")
+ _replace_tag(filename, 'Version', version_converted)
+ _add_or_replace_define(filename, "version_unconverted", version)
+ _replace_spec_setup(filename, "version_unconverted")
else:
- _replace_tag(f, 'Version', version)
- _replace_tag(f, 'Release', "0")
+ _replace_tag(filename, 'Version', version)
+ _replace_tag(filename, 'Release', "0")
# handle debian packages
for f in filter(lambda x: x.endswith(".dsc"), files):
- _replace_tag(f, 'Version', version)
+ filename = outdir + "/" + f
+ shutil.copyfile(f, filename)
+ _replace_tag(filename, 'Version', version)
for f in filter(lambda x: x.endswith(("debian.changelog")), files):
- _replace_debian_changelog_version(f, version)
+ filename = outdir + "/" + f
+ shutil.copyfile(f, filename)
+ _replace_debian_changelog_version(filename, version)
# handle arch linux PKGBUILD files
# TODO: Handle the md5sums generation!
for f in filter(lambda x: x.endswith(("PKGBUILD")), files):
- _replace_tag(f, "md5sums", "(SKIP)")
+ filename = outdir + "/" + f
+ shutil.copyfile(f, filename)
+ _replace_tag(filename, "md5sums", "(SKIP)")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.1/tests/test_base.py
new/obs-service-set_version-0.5.2/tests/test_base.py
--- old/obs-service-set_version-0.5.1/tests/test_base.py 2015-07-28
08:17:48.000000000 +0200
+++ new/obs-service-set_version-0.5.2/tests/test_base.py 2015-08-19
11:26:48.000000000 +0200
@@ -81,12 +81,18 @@
return tar_path
def _run_set_version(self, params=[]):
+ self._tmpoutdir =
tempfile.mkdtemp(prefix='obs-service-set_version-test-outdir-')
cmd = [sys.executable,
SET_VERSION_EXECUTABLE,
- '--outdir', '.'] + params
+ '--outdir', self._tmpoutdir] + params
try:
subprocess.check_output(
cmd, stderr=subprocess.STDOUT, env=os.environ.copy())
+ for f in os.listdir(self._tmpoutdir):
+ os.unlink(self._tmpdir+"/"+f)
+ # FIXME: in most modes the files get not replaced, but store
in parallel with _service: prefix
+ shutil.move(self._tmpoutdir+"/"+f, self._tmpdir)
+ shutil.rmtree(self._tmpoutdir)
except subprocess.CalledProcessError as e:
raise Exception(
"Can not call '%s' in dir '%s'. Error: %s" % ("".join(cmd),
