Commit 3d454baa authored by sof's avatar sof
Browse files

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

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

Merge to STABLE.
parent 4cdc1979
{-# OPTIONS -fglasgow-exts #-} {-# 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 -- Package management tool
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -382,7 +382,7 @@ expandEnvVars pkg force = do ...@@ -382,7 +382,7 @@ expandEnvVars pkg force = do
(nm,_:remainder) -> do (nm,_:remainder) -> do
nm' <- lookupEnvVar nm nm' <- lookupEnvVar nm
str' <- expandString remainder str' <- expandString remainder
return (nm' ++ str') return (xs ++ nm' ++ str')
_ -> return str -- no closing '}' _ -> return str -- no closing '}'
_ -> return str _ -> return str
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment