|
From: <di...@us...> - 2007-06-11 04:00:20
|
Revision: 526
http://safekeep.svn.sourceforge.net/safekeep/?rev=526&view=rev
Author: dimi
Date: 2007-06-10 21:00:18 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Add automatic release detection, for proper Fedora 7 support.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-06-11 00:41:12 UTC (rev 525)
+++ safekeep/trunk/safekeep-test 2007-06-11 04:00:18 UTC (rev 526)
@@ -265,8 +265,12 @@
raise TestFailure('Failed to nuke the tar')
ver = mytar[len('safekeep-'):-len('.tar.gz')]
- binrpm_list = glob.glob(os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-*-' + ver + '-1*.noarch.rpm'))
+ binrpm_list = glob.glob(os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-*-' + ver + '-*.noarch.rpm'))
+ rel = binrpm_list[0]
+ rel = rel[rel.rindex('-')+1:rel.rindex('.')]
+ rel = rel[:rel.rindex('.')]
+
for binrpm in binrpm_list:
if not os.path.isfile(binrpm):
raise TestFailure('Failed to find binary rpm: %s' % binrpm)
@@ -283,12 +287,12 @@
(mkssh('scp'), ' '.join(binrpm_list), user, host, repodir)
print cmd
if os.system(cmd):
- raise TestFailure('Failed to copy safekee-*-%s-1.noarch.rpm to the repository' % ver)
+ raise TestFailure('Failed to copy safekee-*-%s-%s.noarch.rpm to the repository' % (ver, rel))
cmd = 'createrepo %s' % mkarg(repodir)
rcmd(cmd, user, host, 'update repo metadata')
- return ver + '-1'
+ return ver + '-' + rel
def remoteTest(tmproot, client, server):
# build, sign and upload the .rpm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|