Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2013-12-16 07:08:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-11-26 19:21:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes
2013-12-16 07:08:31.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Dec 11 09:24:30 UTC 2013 - [email protected]
+
+- Update to version 0.3.2.1386694317.b85b342:
+ + Fix adding to already existing _servicedata case
+ + Don't reverse changes lines with 'tac'
+ + Fix Python FutureWarning about comparison with None
+ + Improve description of the versionformat parameter.
+- Enable changes generation
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.3.2.1384855776.cc62c54.tar.gz
New:
----
_servicedata
obs-service-tar_scm-0.3.2.1386694317.b85b342.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.XcY3q9/_old 2013-12-16 07:08:32.000000000 +0100
+++ /var/tmp/diff_new_pack.XcY3q9/_new 2013-12-16 07:08:32.000000000 +0100
@@ -19,7 +19,7 @@
%define service tar_scm
Name: obs-service-%{service}
-Version: 0.3.2.1384855776.cc62c54
+Version: 0.3.2.1386694317.b85b342
Release: 0
Summary: An OBS source service: checkout or update a tar ball from
svn/git/hg
License: GPL-2.0+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XcY3q9/_old 2013-12-16 07:08:32.000000000 +0100
+++ /var/tmp/diff_new_pack.XcY3q9/_new 2013-12-16 07:08:32.000000000 +0100
@@ -6,13 +6,12 @@
<param name="version">git-master</param>
<param name="versionformat">0.3.2.%ct.%h</param>
<param name="revision">master</param>
+ <param name="changesgenerate">enable</param>
</service>
-
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
-
<service name="set_version" mode="disabled">
<param name="basename">obs-service-tar_scm</param>
</service>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
<param name="changesrevision">b85b342f80</param>
</service>
</servicedata>++++++ obs-service-tar_scm-0.3.2.1384855776.cc62c54.tar.gz ->
obs-service-tar_scm-0.3.2.1386694317.b85b342.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1384855776.cc62c54/tar_scm
new/obs-service-tar_scm-0.3.2.1386694317.b85b342/tar_scm
--- old/obs-service-tar_scm-0.3.2.1384855776.cc62c54/tar_scm 2013-11-19
11:16:32.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1386694317.b85b342/tar_scm 2013-12-11
10:22:29.000000000 +0100
@@ -189,6 +189,7 @@
xml_parser = None
create_servicedata, tar_scm_service = False, None
tar_scm_xmlstring = " <service name=\"tar_scm\">\n <param
name=\"url\">${MYURL}</param>\n </service>\n"
+root=None
try:
tree = ET.parse(os.path.join("$SRCDIR", "_servicedata"), parser=xml_parser)
root = tree.getroot()
@@ -197,25 +198,27 @@
if param.text == "${MYURL}":
tar_scm_service = service
break
- if tar_scm_service:
+ if tar_scm_service is not None:
changerev_params =
tar_scm_service.findall("param[@name='changesrevision']")
if len(changerev_params) == 1:
print(changerev_params[0].text) # Found what we searched for!
else:
# File exists, is well-formed but does not contain the service we
search
root.append(ET.fromstring(tar_scm_xmlstring))
- tree.write(os.path.join("$MYOUTDIR", "_servicedata"))
+ create_servicedata = True
except IOError as e:
+ root = ET.fromstring("<servicedata>\n%s</servicedata>\n" %
tar_scm_xmlstring)
create_servicedata = True # File doesnt exist
except ET.ParseError as e:
if e.message.startswith("Document is empty"):
+ root = ET.fromstring("<servicedata>\n%s</servicedata>\n" %
tar_scm_xmlstring)
create_servicedata = True # File is empty
else:
print("error: %s" % e) # File is mal-formed, bail out.
except Exception as e:
print("error: %s" % e) # Catch-all, since we are in a here-document
+
if create_servicedata:
- root = ET.fromstring("<servicedata>\n%s</servicedata>\n" %
tar_scm_xmlstring)
ET.ElementTree(root).write(os.path.join("$MYOUTDIR", "_servicedata"))
else:
shutil.copy(os.path.join("$SRCDIR", "_servicedata"),
os.path.join("$MYOUTDIR", "_servicedata"))
@@ -243,7 +246,7 @@
return
fi
debug "Generate changes between $CHANGES_REVISION and $CURRENT_REVISION"
- lines=`safe_run git log --pretty=format:%s --no-merges
${CHANGES_REVISION}..${CURRENT_REVISION} | tac`
+ lines=`safe_run git log --pretty=format:%s --no-merges
${CHANGES_REVISION}..${CURRENT_REVISION}`
;;
svn|hg|bzr)
debug "Unable to generate changes for subversion, mercurial or bazaar,
skipping changes file generation"
@@ -279,7 +282,7 @@
if param.text == "${MYURL}":
tar_scm_service = service
break
-if tar_scm_service:
+if tar_scm_service is not None:
changerev_params =
tar_scm_service.findall("param[@name='changesrevision']")
if len(changerev_params) == 1: # already present, just update
if changerev_params[0].text != "${CHANGES_REVISION}":
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1384855776.cc62c54/tar_scm.service
new/obs-service-tar_scm-0.3.2.1386694317.b85b342/tar_scm.service
--- old/obs-service-tar_scm-0.3.2.1384855776.cc62c54/tar_scm.service
2013-11-19 11:16:32.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1386694317.b85b342/tar_scm.service
2013-12-11 10:22:29.000000000 +0100
@@ -20,7 +20,34 @@
<description>Specify version to be used in tarball. Defaults to
automatically detected value formatted by versionformat parameter.</description>
</param>
<param name="versionformat">
- <description>Auto-generate version from checked out source using this
format string. For git, value is passed via git show --pretty=format:...
(default '%ct'); for hg, via hg log --template=... (default '{rev}'); for bzr
and svn, %r is revision (default '%r'). Overrides tarball name defined by
version parameter. For git, @PARENT_TAG@ points to the first tag that is
reachable from the current revision of the chosen branch.</description>
+ <description>
+ Auto-generate version from checked out source using this format
+ string. This parameter is used if the 'version' parameter is not
+ specified.
+
+ For git, the value is passed to git log --date=short --pretty=format:...
+ for the topmost commit, and the output from git is cleaned up to
+ remove some unhelpful characters. Here are some useful examples of
+ strings which are expanded, see the git-log documentation for more.
+
+ %ct Commit time as a UNIX timestamp, e.g. 1384855776.
+ This is the default.
+
+ %at Author time as a UNIX timestamp, e.g. 1384855776.
+
+ %cd Commit date in YYYYMMDD format, e.g. 20131119
+
+ %ad Author date in YYYYMMDD format, e.g. 20131119
+
+ %h Abbreviated hash, e.g. cc62c54
+
+ @PARENT_TAG@ the first tag that is reachable, e.g. v0.2.3
+
+ For hg, the value is passed to hg log --template=.... See the
+ hg documentation for more information. The default is '{rev}'
+
+ For bzr and svn, '%r' is expanded to the revision, and is the default.
+ </description>
</param>
<param name="versionprefix">
<description>specify a base version as prefix.</description>
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
