picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

* Added a command to list installed packages.

This commit is contained in:
Eelco Dolstra 2003-03-21 15:58:40 +00:00
parent 2e59698b78
commit 800d8e950f
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nix.cc
View File

@ -237,7 +237,7 @@ void installPkg(string pkgref)
string cmd;
string builder;
if (!queryDB("refs", pkgref, pkgfile))
if (!queryDB(dbRefs, pkgref, pkgfile))
throw Error("unknown package " + pkgref);
cerr << "installing package " + pkgref + " from " + pkgfile + "\n";
@ -272,7 +272,7 @@ void installPkg(string pkgref)
string file;
if (!queryDB("refs", it->ref, file))
if (!queryDB(dbRefs, it->ref, file))
throw Error("unknown file " + it->ref);
if (makeRef(file) != it->ref)
@ -437,6 +437,23 @@ void verifyDB()
}
void listInstalledPkgs()
{
DBPairs instPkgs;
enumDB(dbInstPkgs, instPkgs);
for (DBPairs::iterator it = instPkgs.begin();
it != instPkgs.end(); it++)
{
string descr;
if (!queryDB(dbRefs, it->first, descr))
descr = "descriptor missing";
cout << it->first << " " << descr << endl;
}
}
void run(int argc, char * * argv)
{
UsageError argcError("wrong number of arguments");
@ -464,6 +481,9 @@ void run(int argc, char * * argv)
} else if (cmd == "reginst") {
if (argc != 2) throw argcError;
registerInstalledPkg(argv[0], argv[1]);
} else if (cmd == "listinst") {
if (argc != 0) throw argcError;
listInstalledPkgs();
} else
throw UsageError("unknown command: " + string(cmd));
}

2
test/build/pan-build.sh
View File

@ -2,7 +2,7 @@
export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
export LD_LIBRARY_PATH=$gnet/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
top=`pwd`
tar xvfj $src