[Erp5-report] r34072 lucas - /erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/

[nobody at svn.erp5.org]

Author: lucas
Date: Wed Mar 24 19:41:57 2010
New Revision: 34072

URL: http://svn.erp5.org?rev=34072&view=rev
Log:
- __requires_exceptions are different for each architecture (x86_64 and i586)


Modified:
    erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py

Modified: erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py?rev=34072&r1=34071&r2=34072&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py [utf8] (original)
+++ erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py [utf8] Wed Mar 24 19:41:57 2010
@@ -1,8 +1,11 @@
 import os
+import platform
+import collective.recipe.template
 from subprocess import Popen, PIPE
-import collective.recipe.template
+
 
 class Recipe(object):
+
   def __init__(self, buildout, name, options):
     """
       Create a Mandriva RPM spec file from a template
@@ -22,7 +25,7 @@
     self.buildout = buildout
 
   def install(self):
-    dependencies = ''
+    dependencies = []
     helper_script = self.options.get('helper_script')
     if helper_script is not None:
       process = Popen([helper_script, "-l"], stdout=PIPE)
@@ -37,10 +40,24 @@
       version = open(version, 'r').read().strip()
 
     release = self.options.get('release', str(1))
+    
+    require_exception_list = []
+    if self.options.get('requires_exceptions_x86_64') is not None or \
+        self.options.get('requires_exceptions_i586') is not None:
+      if platform.machine() == 'x86_64':
+        requires_exceptions = self.options.get('requires_exceptions_x86_64')
+      else:
+        requires_exceptions = self.options.get('requires_exceptions_i586')
+    
+      require_exception_list = ['\\\\(']
+      require_exception_list.extend(['\\\\|'.join([lib \
+                                     for lib in requires_exceptions.split()])])
+      require_exception_list.extend(['\\\\)'])
 
     self.options.update(dependencies="\n".join(dependencies),
                    version=version,
-                   release=release)
+                   release=release,
+                   requires_exceptions=''.join(require_exception_list))
 
     template = collective.recipe.template.Recipe(self.buildout,
                                                  'ignored',