about summary refs log tree commit diff
path: root/src/nix-env/main.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-10-17T14·01+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-10-17T14·01+0000
commit24737f279e6f1e0fd079609b9397deb867925324 (patch)
treeb2c8b9938227aebd9ebd31b6016f9304443bbb3c /src/nix-env/main.cc
parent4bd5cdb90b980bd5e0eec86bf3fcfdd3b07946d1 (diff)
* Backwards compatibility with old user environment manifests.
Diffstat (limited to 'src/nix-env/main.cc')
-rw-r--r--src/nix-env/main.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index f67a0768979b..f2a9957306c9 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -107,10 +107,11 @@ struct AddPos : TermFun
 {
     ATerm operator () (ATerm e)
     {
-        ATerm x, y, z;
-        if (matchBind(e, x, y, z)) return e;
-        if (matchBind2(e, x, y))
+        ATerm x, y;
+        if (matchObsoleteBind(e, x, y))
             return makeBind(x, y, makeNoPos());
+        if (matchObsoleteStr(e, x))
+            return makeStr(x, ATempty);
         return e;
     }
 };
@@ -921,6 +922,8 @@ static void opQuery(Globals & globals,
             else
                 table.push_back(columns);
 
+            cout.flush();
+
         } catch (AssertionError & e) {
             /* !!! hm, maybe we should give some sort of warning here? */
         }