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

[nobody at svn.erp5.org]

Author: lucas
Date: Thu May 13 21:20:42 2010
New Revision: 35303

URL: http://svn.erp5.org?rev=35303&view=rev
Log:
This recipe handles two types of requires list (i586 and x86_64).

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=35303&r1=35302&r2=35303&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py [utf8] (original)
+++ erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py [utf8] Thu May 13 21:20:42 2010
@@ -54,10 +54,16 @@
                                      for lib in requires_exceptions.split()])])
       require_exception_list.extend(['\\\\)'])
 
-    require_list = self.options.get('requires')
-    if require_list is not None:
+    require_list = []
+    if None not in [self.options.get('requires_i586'),
+                    self.options.get('requires_x86_64')]:
+      if platform.machine() == 'x86_64':
+        require_list = self.options.get('requires_x86_64').split()
+      else:
+        require_list = self.options.get('requires_i586').split()
+
       require_list.sort()
-      require_list = ["Requires: %s" % pkg for pkg in self.options.get('requires').split()]
+      require_list = ["Requires: %s" % pkg for pkg in require_list]
 
     self.options.update(dependencies="\n".join(dependencies),
                    version=version,