qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Remove build directory from a package directory after building it.

Browse source
This commit is contained in:
Eelco Dolstra 2003-04-25 15:01:15 +00:00
parent 76205df09c
commit fcc5ae151b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nix.cc
View file

@ -333,6 +333,11 @@ build:
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
throw Error("unable to build package"); throw Error("unable to build package");
/* Remove write permission from the build directory. */
int res = system(("chmod -R -w " + path).c_str()); // !!! escaping
if (WEXITSTATUS(res) != 0)
throw Error("cannot remove write permission from " + path);
} catch (exception &) { } catch (exception &) {
system(("rm -rf " + path).c_str()); system(("rm -rf " + path).c_str());
throw; throw;
@ -411,10 +416,10 @@ void delPkg(string hash)
string path; string path;
checkHash(hash); checkHash(hash);
if (queryDB(dbInstPkgs, hash, path)) { if (queryDB(dbInstPkgs, hash, path)) {
int res = system(("rm -rf " + path).c_str()); // !!! escaping int res = system(("chmod -R +w " + path + " && rm -rf " + path).c_str()); // !!! escaping
delDB(dbInstPkgs, hash); // not a bug delDB(dbInstPkgs, hash); // not a bug ???
if (WEXITSTATUS(res) != 0) if (WEXITSTATUS(res) != 0)
throw Error("cannot delete " + path); cerr << "errors deleting " + path + ", ignoring" << endl;
} }
} }