CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/06/08 12:31:23

Modified files:
        lily           : main.cc 
        .              : ChangeLog 

Log message:
        (prepend_env_path): Bugfix: Check directory
        existence before appending original path.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.258&tr2=1.259&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3738&tr2=1.3739&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3738 lilypond/ChangeLog:1.3739
--- lilypond/ChangeLog:1.3738   Wed Jun  8 11:26:12 2005
+++ lilypond/ChangeLog  Wed Jun  8 12:31:23 2005
@@ -1,3 +1,8 @@
+2005-06-08  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * lily/main.cc (prepend_env_path): Bugfix: Check directory
+       existence before appending original path.
+
 2005-06-08  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
        * ttftool/parse.c (readNamingTable): verbosity for "bad TTF
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.258 lilypond/lily/main.cc:1.259
--- lilypond/lily/main.cc:1.258 Tue Jun  7 07:45:32 2005
+++ lilypond/lily/main.cc       Wed Jun  8 12:31:22 2005
@@ -282,10 +282,12 @@
 static int
 prepend_env_path (char const *key, String value)
 {
-  if (char const* cur = getenv (key))
-    value += to_string (PATHSEP) + cur;
   if (is_dir (value))
-    return sane_putenv (key, value.to_str0 ());
+    {
+      if (char const* cur = getenv (key))
+       value += to_string (PATHSEP) + cur;
+      return sane_putenv (key, value.to_str0 ());
+    }
   else if (be_verbose_global)
     warning (_f ("no such directory: %s", value));
   return -1;


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to