Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs17:/tmp/cvs-serv7452

Modified Files:
      Tag: branch_0_27
        ChangeLog Services.pm 
Log Message:
test for existence of gcc_select before calling it


Index: Services.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.214.6.1
retrieving revision 1.214.6.2
diff -u -d -r1.214.6.1 -r1.214.6.2
--- Services.pm 12 Jun 2007 18:25:43 -0000      1.214.6.1
+++ Services.pm 12 Jun 2007 19:16:42 -0000      1.214.6.2
@@ -1304,9 +1304,11 @@
 
 sub fix_gcc_repairperms {
        return unless gcc_select_arg(gcc_selected) eq '4.0';
-       system('/usr/bin/env PATH=/usr/sbin:/usr/bin:/sbin:/bin '
+       if (-x '/usr/sbin/gcc_select') {
+               system('/usr/bin/env PATH=/usr/sbin:/usr/bin:/sbin:/bin '
                . 'gcc_select --force 4.0 >/dev/null 2>&1') == 0
                or die "Can't fix GCC after Repair Permissions: $!\n";
+       }
 }
 
 =item enforce_gcc

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1441.2.8
retrieving revision 1.1441.2.9
diff -u -d -r1.1441.2.8 -r1.1441.2.9
--- ChangeLog   12 Jun 2007 18:25:43 -0000      1.1441.2.8
+++ ChangeLog   12 Jun 2007 19:16:41 -0000      1.1441.2.9
@@ -1,5 +1,9 @@
 2007-06-12  Dave Morrison  <[EMAIL PROTECTED]>
 
+       * Services.pm: test for existence of gcc_select before calling it
+
+2007-06-12  Dave Morrison  <[EMAIL PROTECTED]>
+
        * Services.pm: fall back to checking the gcc symlink if
        gcc_select is not there (backport from HEAD, change made by 
        rangerrick on 2007-06-11)


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to