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

Browse source
This commit is contained in:
Wouter den Breejen 2007-09-11 16:22:07 +00:00
parent ed55982085
commit e80c7bda4c
4 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libmain/shared.cc
View file

@ -138,23 +138,29 @@ static void initAndRun(int argc, char * * argv)
while (argc--) args.push_back(*argv++); while (argc--) args.push_back(*argv++);
args.erase(args.begin()); args.erase(args.begin());
/* Expand compound dash options (i.e., `-qlf' -> `-q -l -f'), and /* We dont expand for nix-state since we need to pass arguments to other
ignore options for the ATerm library. */ * programs that can decide for themselves if they want expansion or not
for (Strings::iterator i = args.begin(); i != args.end(); ++i) { */
string arg = *i; if(programId != "nix-state")
if (string(arg, 0, 4) == "-at-") ; {
else if (arg.length() > 2 && arg[0] == '-' && arg[1] != '-') { /* Expand compound dash options (i.e., `-qlf' -> `-q -l -f'), and
for (unsigned int j = 1; j < arg.length(); j++) ignore options for the ATerm library. */
if (isalpha(arg[j])) for (Strings::iterator i = args.begin(); i != args.end(); ++i) {
remaining.push_back((string) "-" + arg[j]); string arg = *i;
else { if (string(arg, 0, 4) == "-at-") ;
remaining.push_back(string(arg, j)); else if (arg.length() > 2 && arg[0] == '-' && arg[1] != '-') {
break; for (unsigned int j = 1; j < arg.length(); j++)
} if (isalpha(arg[j]))
} else remaining.push_back(arg); remaining.push_back((string) "-" + arg[j]);
else {
remaining.push_back(string(arg, j));
break;
}
} else remaining.push_back(arg);
}
args = remaining;
remaining.clear();
} }
args = remaining;
remaining.clear();
/* Process default options. */ /* Process default options. */
for (Strings::iterator i = args.begin(); i != args.end(); ++i) { for (Strings::iterator i = args.begin(); i != args.end(); ++i) {

3
src/libstore/build.cc
View file

@ -1914,7 +1914,8 @@ void DerivationGoal::deleteTmpDir(bool force)
getOwnership(tmpDir); getOwnership(tmpDir);
} }
else else
deletePathWrapped(tmpDir); deletePathWrapped(tmpDir);
tmpDir = ""; tmpDir = "";
} }
} }

1
src/nix-env/nix-env.cc
View file

@ -650,6 +650,7 @@ static void installDerivations(Globals & globals,
externalState_p.erase(externalState_p.length(),1); externalState_p.erase(externalState_p.length(),1);
externalState_p = externalState_p.substr(0,externalState_p.find_last_of('/')); externalState_p = externalState_p.substr(0,externalState_p.find_last_of('/'));
ensureDirExists(externalState_p); ensureDirExists(externalState_p);
//printMsg(lvlError, format("EnsureDir: '%1%'") % externalState_p);
} }
//Now we create a symlink externalState --> statePath //Now we create a symlink externalState --> statePath

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

@ -594,8 +594,10 @@ void run(Strings args)
username = arg.substr(7,arg.length()); username = arg.substr(7,arg.length());
else else{
opArgs.push_back(arg); opArgs.push_back(arg);
//printMsg(lvlInfo, format("ARG: %1%") % arg);
}
//in the startscript u can have --run, but could do showrevisions //in the startscript u can have --run, but could do showrevisions
if (oldOp && oldOp != op && oldOp != opRunComponent) if (oldOp && oldOp != op && oldOp != opRunComponent)