Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2013-11-01 14:38:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-07 20:46:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes
2013-11-01 14:38:37.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Oct 30 14:02:27 UTC 2013 - adr...@suse.de
+
+- Bump version to 0.3.1
+ * do not execute tar base file name
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.3.0.1375457512.9de0986.tar.gz
New:
----
obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.R8MhWe/_old 2013-11-01 14:38:39.000000000 +0100
+++ /var/tmp/diff_new_pack.R8MhWe/_new 2013-11-01 14:38:39.000000000 +0100
@@ -19,7 +19,7 @@
%define service tar_scm
Name: obs-service-%{service}
-Version: 0.3.0.1375457512.9de0986
+Version: 0.3.1.1383144507.58d1af8
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.R8MhWe/_old 2013-11-01 14:38:39.000000000 +0100
+++ /var/tmp/diff_new_pack.R8MhWe/_new 2013-11-01 14:38:39.000000000 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
- <param name="versionformat">0.3.0.%ct.%h</param>
+ <param name="versionformat">0.3.1.%ct.%h</param>
<param name="revision">master</param>
</service>
++++++ obs-service-tar_scm-0.3.0.1375457512.9de0986.tar.gz ->
obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm 2013-08-02
17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm 2013-10-30
15:58:20.000000000 +0100
@@ -24,7 +24,6 @@
USE_SUBMODULES=enable
# MYHISTORYDEPTH=""
INCLUDES=""
- MYTARFILENAME='${NAME}-${VERSION}'
}
get_config_options () {
@@ -97,13 +96,9 @@
USE_SUBMODULES="$2"
shift
;;
- *-tarfilename)
- MYTARFILENAME="$2"
- shift
- ;;
*)
echo "Unknown parameter: $1"
- echo 'Usage: $SERVICE --scm $SCM --url $URL [--subdir $SUBDIR]
[--revision $REVISION] [--version $VERSION] [--include $INCLUDE]* [--exclude
$EXCLUDE]* [--versionformat $FORMAT] [--versionprefix $PREFIX] [--filename
$FILENAME] [--package-meta $META] [--submodules disable] [--tarfilename
"${NAME}-${VERSION}"] --outdir $OUT'
+ echo 'Usage: $SERVICE --scm $SCM --url $URL [--subdir $SUBDIR]
[--revision $REVISION] [--version $VERSION] [--include $INCLUDE]* [--exclude
$EXCLUDE]* [--versionformat $FORMAT] [--versionprefix $PREFIX] [--filename
$FILENAME] [--package-meta $META] [--submodules disable] --outdir $OUT'
exit 1
;;
esac
@@ -396,18 +391,23 @@
TAR_VERSION="$MYPREFIX$version"
}
+ISO_CLEANUP_RE='s@([0-9]{4})-([0-9]{2})-([0-9]{2})
+([0-9]{2})([:]([0-9]{2})([:]([0-9]{2}))?)?( +[-+][0-9]{3,4})?@\1\2\3T\4\6\8@g'
+
get_version () {
case "$MYSCM" in
git)
#version=`safe_run git show --pretty=format:"$MYFORMAT" | head -n 1`
if [[ "$MYFORMAT" =~ .*@PARENT_TAG@.* ]] ; then
- MYFORMAT=${MYFORMAT/@PARENT_TAG@/$(git describe --tags --abbrev=0)}
+ PARENT_TAG=$(git describe --tags --abbrev=0)
+ PARENT_TAG=${PARENT_TAG/-/.}
+ MYFORMAT=${MYFORMAT/@PARENT_TAG@/$PARENT_TAG}
+ echo "MYFORMAT: $MYFORMAT"
if [ $? -gt 0 ] ; then
echo -e "\e[0;31mThe git repository has no tags, thus
@PARENT_TAG@ can not be expanded\e[0m"
exit 1
fi
fi
- version=`safe_run git log -n1 --date=short
--pretty=format:"$MYFORMAT"|sed 's@-@@g'`
+ version=`safe_run git log -n1 --date=short --pretty=format:"$MYFORMAT" |
sed -r -e "$ISO_CLEANUP_RE" -e 's@[-:]@@g'`
;;
svn)
#rev=`LC_ALL=C safe_run svn info | awk '/^Revision:/ { print $2 }'`
@@ -441,7 +441,7 @@
# extract only the first value from the tuple, except for maybe
# 'sub(...)' which is only available since 2.4 (first introduced
# in openSUSE 12.3).
- version=`safe_run hg log -l1 -r$rev --template "$MYFORMAT"|sed 's@-@@g'`
+ version=`safe_run hg log -l1 -r$rev --template "$MYFORMAT" | sed -r -e
"$ISO_CLEANUP_RE" -e 's@[-:]@@g'`
;;
bzr)
#safe_run bzr log -l1 ...
@@ -461,29 +461,26 @@
if [ -z "$TAR_VERSION" ]; then
TAR_BASENAME="$FILE"
else
- NAME="$FILE"
- VERSION="$TAR_VERSION"
- TAR_BASEDIR="${FILE}-${TAR_VERSION}"
- TAR_BASENAME=`eval echo ${MYTARFILENAME}`
+ TAR_BASENAME="${FILE}-${TAR_VERSION}"
fi
MYINCLUDES=""
for INC in $INCLUDES; do
- MYINCLUDES="$MYINCLUDES $TAR_BASEDIR/$INC"
+ MYINCLUDES="$MYINCLUDES $TAR_BASENAME/$INC"
done
if [ -z "$MYINCLUDES" ]; then
- MYINCLUDES="$TAR_BASEDIR"
+ MYINCLUDES="$TAR_BASENAME"
fi
safe_run cd "$MYOUTDIR"
if [ -n "$CACHEDIRECTORY" ]; then
- debug cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASEDIR"
- safe_run cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASEDIR"
+ debug cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME"
+ safe_run cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME"
else
- debug "mv #2: $REPOPATH/$MYSUBDIR -> $TAR_BASEDIR"
- safe_run mv "$REPOPATH/$MYSUBDIR" "$TAR_BASEDIR"
+ debug mv3 "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME"
+ safe_run mv "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME"
fi
}
@@ -496,8 +493,8 @@
}
cleanup () {
- debug rm -rf "$TAR_BASEDIR" "$FILE"
- rm -rf "$TAR_BASEDIR" "$FILE"
+ debug rm -rf "$TAR_BASENAME" "$FILE"
+ rm -rf "$TAR_BASENAME" "$FILE"
}
main () {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm.service
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm.service
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm.service
2013-08-02 17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm.service
2013-10-30 15:58:20.000000000 +0100
@@ -66,11 +66,5 @@
<allowedvalue>enable</allowedvalue>
<allowedvalue>disable</allowedvalue>
</param>
- <param name="tarfilename">
- <description>RPM or Deb naming?</description>
- <allowedvalue>${NAME}-${VERSION}</allowedvalue>
- <allowedvalue>${NAME}_${VERSION}</allowedvalue>
- <allowedvalue>${NAME}_${VERSION}.orig</allowedvalue>
- </param>
</service>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/commontests.py
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/commontests.py
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/commontests.py
2013-08-02 17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/commontests.py
2013-10-30 15:58:20.000000000 +0100
@@ -9,12 +9,7 @@
from utils import mkfreshdir
class CommonTests(TestEnvironment, TestAssertions):
- def default_name(self):
- return "repo"
-
- def basename(self, name=None, version=None):
- if name is None:
- name = self.default_name()
+ def basename(self, name='repo', version=None):
if version is None:
version = self.default_version()
return '%s-%s' % (name, version)
@@ -58,36 +53,6 @@
self.tar_scm_std('--filename', filename, '--version', version)
self.assertTarOnly(self.basename(filename, version))
- def test_tarfilename(self):
- filename = 'myfilename'
- version = '0.7'
- tarfilename = '${NAME}-${VERSION}'
- tarbasename = filename + "-" + version
- self.tar_scm_std('--filename', filename, '--version', version,
'--tarfilename', tarfilename)
- self.assertTarOnly( tarbasename = tarbasename, toptardir =
self.basename(filename, version) )
-
- def test_tarfilename_NAME_VERSION_defaults(self):
- tarfilename = '${NAME}_${VERSION}'
- tarbasename = self.default_name() + "_" + self.default_version()
- self.tar_scm_std( '--tarfilename', tarfilename)
- self.assertTarOnly( tarbasename = tarbasename, toptardir =
self.basename() )
-
- def test_tarfilename_NAME_VERSION(self):
- filename = 'myfilename'
- version = '0.7'
- tarfilename = '${NAME}_${VERSION}'
- tarbasename = filename + "_" + version
- self.tar_scm_std('--filename', filename, '--version', version,
'--tarfilename', tarfilename)
- self.assertTarOnly( tarbasename = tarbasename, toptardir =
self.basename(filename, version) )
-
- def test_tarfilename_NAME_VERSION_orig(self):
- filename = 'myfilename'
- version = '0.7'
- tarfilename = '${NAME}_${VERSION}.orig'
- tarbasename = filename + "_" + version + ".orig"
- self.tar_scm_std('--filename', filename, '--version', version,
'--tarfilename', tarfilename)
- self.assertTarOnly( tarbasename = tarbasename, toptardir =
self.basename(filename, version) )
-
def test_revision_nop(self):
self.tar_scm_std('--revision', self.rev(2))
th = self.assertTarOnly(self.basename())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/githgtests.py
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/githgtests.py
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/githgtests.py
2013-08-02 17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/githgtests.py
2013-10-30 15:58:20.000000000 +0100
@@ -20,6 +20,10 @@
self.tar_scm_std('--versionformat', self.yyyymmdd_format)
self.assertTarOnly(self.basename(version =
self.dateYYYYMMDD(self.rev(2))))
+ def test_versionformat_dateYYYYMMDDHHMMSS(self):
+ self.tar_scm_std('--versionformat', self.yyyymmddhhmmss_format)
+ self.assertTarOnly(self.basename(version =
self.dateYYYYMMDDHHMMSS(self.rev(2))))
+
def _mixed_version_format(self):
return self.mixed_version_template % (self.timestamp_format,
self.abbrev_hash_format)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/gittests.py
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/gittests.py
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/gittests.py
2013-08-02 17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/gittests.py
2013-10-30 15:58:20.000000000 +0100
@@ -16,6 +16,7 @@
abbrev_hash_format = '%h'
timestamp_format = '%ct'
yyyymmdd_format = '%cd'
+ yyyymmddhhmmss_format = '%ci'
def default_version(self):
return self.timestamps(self.rev(2))
@@ -30,6 +31,11 @@
dateobj = datetime.date.fromtimestamp(float(self.timestamps(rev)))
return dateobj.strftime("%4Y%02m%02d")
+ # This comment line helps align lines with hgtests.py.
+ def dateYYYYMMDDHHMMSS(self, rev):
+ dateobj = datetime.datetime.fromtimestamp(float(self.timestamps(rev)))
+ return dateobj.strftime("%4Y%02m%02dT%02H%02M%02S")
+
def rev(self, rev):
f = self.fixtures
return f.revs[f.repo_path][rev]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/hgtests.py
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/hgtests.py
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/hgtests.py
2013-08-02 17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/hgtests.py
2013-10-30 15:58:20.000000000 +0100
@@ -15,6 +15,7 @@
abbrev_hash_format = '{node|short}'
timestamp_format = '{date}'
yyyymmdd_format = '{date|shortdate}'
+ yyyymmddhhmmss_format = '{date|isodatesec}'
def default_version(self):
return self.rev(2)
@@ -28,3 +29,7 @@
def dateYYYYMMDD(self, rev):
dateobj = datetime.date.fromtimestamp(self.timestamps(rev)[0])
return dateobj.strftime("%4Y%02m%02d")
+
+ def dateYYYYMMDDHHMMSS(self, rev):
+ dateobj = datetime.datetime.fromtimestamp(self.timestamps(rev)[0])
+ return dateobj.strftime("%4Y%02m%02dT%02H%02M%02S")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/testassertions.py
new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/testassertions.py
--- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/testassertions.py
2013-08-02 17:47:31.000000000 +0200
+++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/testassertions.py
2013-10-30 15:58:20.000000000 +0100
@@ -79,9 +79,9 @@
tarpath = os.path.join(self.outdir, tar)
return tarchecker(tarpath, toptardir)
- def assertTarOnly(self, tarbasename, toptardir=None, **kwargs):
+ def assertTarOnly(self, tarbasename, **kwargs):
dirents = self.assertNumDirents(self.outdir, 1)
- return self.checkTar(dirents[0], tarbasename, toptardir, **kwargs)
+ return self.checkTar(dirents[0], tarbasename, **kwargs)
def assertTarAndDir(self, tarbasename, dirname=None, **kwargs):
if not dirname:
@@ -103,7 +103,7 @@
self.assertTrue(os.path.isdir(os.path.join(self.outdir, wd)),
dirname + ' should be directory')
- return self.checkTar(tar, tarbasename, toptardir=dirname, **kwargs)
+ return self.checkTar(tar, tarbasename, **kwargs)
def assertTarMemberContains(self, th, tarmember, contents):
f = th.extractfile(tarmember)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
