SF.net SVN: safekeep: [524] safekeep/trunk

[<di...@us...>]

Revision: 524
          http://safekeep.svn.sourceforge.net/safekeep/?rev=524&view=rev
Author:   dimi
Date:     2007-06-10 16:02:54 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Adjust the test to support also Fedora 7, which
includes the distro id automatically in the generated
rpm names.

Modified Paths:
--------------
    safekeep/trunk/safekeep-test

Property Changed:
----------------
    safekeep/trunk/


Property changes on: safekeep/trunk
___________________________________________________________________
Name: svn:ignore
   + releases


Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test	2007-06-08 22:11:59 UTC (rev 523)
+++ safekeep/trunk/safekeep-test	2007-06-10 23:02:54 UTC (rev 524)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import getopt, os, os.path, re, shutil, socket, sys
+import getopt, glob, os, os.path, re, shutil, socket, sys
 import commands, random, time, tempfile, traceback
 from commands import mkarg
 
@@ -265,24 +265,22 @@
         raise TestFailure('Failed to nuke the tar')
 
     ver = mytar[len('safekeep-'):-len('.tar.gz')]
-    binrpm_common = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-common-' + ver + '-1.noarch.rpm')
-    binrpm_client = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-client-' + ver + '-1.noarch.rpm')
-    binrpm_server = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-server-' + ver + '-1.noarch.rpm')
+    binrpm_list = glob.glob(os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-*-' + ver + '-1*.noarch.rpm'))
 
-    for binrpm in (binrpm_common, binrpm_client, binrpm_server):
+    for binrpm in binrpm_list:
         if not os.path.isfile(binrpm):
             raise TestFailure('Failed to find binary rpm: %s' % binrpm)
 
     if sign_packages:   
-        cmd = 'rpm --define %s --addsign %s %s %s' % \
-              (mkarg('_gpg_name ' + keyname), binrpm_common, binrpm_client, binrpm_server)
+        cmd = 'rpm --define %s --addsign %s' % \
+              (mkarg('_gpg_name ' + keyname), ' '.join(binrpm_list))
         print cmd
         if os.system(cmd):
             raise TestFailure('Failed to sign rpms')
 
     for repodir in repodirs:
-        cmd = '%s %s %s %s %s@%s:%s/noarch' % \
-              (mkssh('scp'), binrpm_common, binrpm_client, binrpm_server, user, host, repodir)
+        cmd = '%s %s %s@%s:%s/noarch' % \
+              (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) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.