nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 04:00:59 +01:00
Code Activity

merged executeAndPrintShellCommand to runProgram

Browse source
This commit is contained in:
Wouter den Breejen 2007-06-28 13:17:03 +00:00
parent 729933062b
commit b9fe3f00c1
5 changed files with 47 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/nix-state/nix-state.cc
View file

@ -213,7 +213,7 @@ static void opRunComponent(Strings opFlags, Strings opArgs)
//******************* Run ****************************
executeAndPrintShellCommand(componentPath + binary, "", false); //more efficient way needed ???
executeShellCommand(componentPath + binary); //more efficient way needed ???
//******************* With everything in place, we call the commit script on all statePaths **********************
@ -317,12 +317,13 @@ static void opRunComponent(Strings opFlags, Strings opArgs)
}
//make the call
executeAndPrintShellCommand(nixLibexecDir + "/nix/nix-statecommit.sh " + svnbin +
" \"" + subversionedstatepathsarray + "\" " +
" \"" + subversionedpathsCommitBooleansarray + "\" " +
" \"" + nonversionedstatepathsarray + "\" " +
" \"" + commandsarray + "\" ",
"commit-script", true);
Strings p_args;
p_args.push_back(svnbin);
p_args.push_back(subversionedstatepathsarray);
p_args.push_back(subversionedpathsCommitBooleansarray);
p_args.push_back(nonversionedstatepathsarray);
p_args.push_back(commandsarray);
runProgram_AndPrintOutput(nixLibexecDir + "/nix/nix-statecommit.sh", true, p_args, "svn");
//TODO
//Scan again??