[project @ 2003-08-17 01:36:54 by sof]

expandEnvVars.expandString: don't drop prefix when locating variable
reference.

Merge to STABLE.

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index 24092ab..2b51934 100644 (file)
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fglasgow-exts #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.34 2003/05/30 13:32:20 simonmar Exp $
+-- $Id: Main.hs,v 1.35 2003/08/17 01:36:54 sof Exp $
 --
 -- Package management tool
 -----------------------------------------------------------------------------
@@ -382,7 +382,7 @@ expandEnvVars pkg force = do
           (nm,_:remainder) -> do
              nm'  <- lookupEnvVar nm
              str' <- expandString remainder
-             return (nm' ++ str')
+             return (xs ++ nm' ++ str')
           _ -> return str -- no closing '}'
        _ -> return str