[Erp5-report] r41092 kazuhiko - /erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec  3 15:04:29 2010
New Revision: 41092

URL: http://svn.erp5.org?rev=41092&view=rev
Log:
cleanup.

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=41092&r1=41091&r2=41092&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py [utf8] (original)
+++ erp5/trunk/utils/rpmgen/recipes/createmandrivaspec/createmandrivaspec.py [utf8] Fri Dec  3 15:04:29 2010
@@ -40,30 +40,26 @@ class Recipe(object):
       version = open(version, 'r').read().strip()
 
     release = self.options.get('release', str(1))
+    machine_dict = {
+      'i686':'i586',
+      }
+    machine = platform.machine()
+    machine = machine_dict.get(machine, machine)
     
-    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')
-    
+    requires_exceptions = self.options.get('requires_exceptions_%s' % machine)
+    if requires_exceptions is not None:
       require_exception_list = ['\\\\(']
       require_exception_list.extend(['\\\\|'.join([lib \
                                      for lib in requires_exceptions.split()])])
       require_exception_list.extend(['\\\\)'])
+    else:
+      require_exception_list = []
 
-    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 require_list]
+    requires = self.options.get('requires_%s' % machine)
+    if requires is not None:
+      require_list = ["Requires: %s" % pkg for pkg in sorted(requires.split())]
+    else:
+      require_list = []
 
     self.options.update(dependencies="\n".join(dependencies),
                    version=version,