[Uludag-commits] r14601 - trunk/pisi/pisi/actionsapi

[uludag-commits at pardus.org.tr]

Author: caglar
Date: Sat Jun 30 23:37:07 2007
New Revision: 14601

Modified:
   trunk/pisi/pisi/actionsapi/autotools.py
   trunk/pisi/pisi/actionsapi/cmaketools.py
Log:
fixInfoDir needlessly always called, patch from Eren Türkay

Modified: trunk/pisi/pisi/actionsapi/autotools.py
=================================================================
--- trunk/pisi/pisi/actionsapi/autotools.py	(original)
+++ trunk/pisi/pisi/actionsapi/autotools.py	Sat Jun 30 23:37:07 2007
@@ -122,21 +122,22 @@
 
         if system(args):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
 
-    fixInfoDir()
 
 def rawInstall(parameters = '', argument = 'install'):
     '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()'''
     if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
         if system('make %s %s' % (parameters, argument)):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
 
-    fixInfoDir()
-
 def aclocal(parameters = ''):
     '''generates an aclocal.m4 based on the contents of configure.in.'''
     if system('aclocal %s' % parameters):

Modified: trunk/pisi/pisi/actionsapi/cmaketools.py
=================================================================
--- trunk/pisi/pisi/actionsapi/cmaketools.py	(original)
+++ trunk/pisi/pisi/actionsapi/cmaketools.py	Sat Jun 30 23:37:07 2007
@@ -98,17 +98,17 @@
 
         if system(args):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
 
-    fixInfoDir()
-
 def rawInstall(parameters = '', argument = 'install'):
     '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()'''
     if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
         if system('make %s %s' % (parameters, argument)):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
-
-    fixInfoDir()