* Refactoring to support SHA-1.
This commit is contained in:
		
							parent
							
								
									d46b4262dc
								
							
						
					
					
						commit
						73992371a3
					
				
					 6 changed files with 36 additions and 18 deletions
				
			
		|  | @ -60,7 +60,7 @@ static Path copyAtom(EvalState & state, const Path & srcPath) | |||
| 
 | ||||
|     Hash drvHash = hashDerivation(state, ne); | ||||
|     Path drvPath = writeTerm(unparseStoreExpr(ne), ""); | ||||
|     state.drvHashes[drvPath] = drvHash; | ||||
|     state.drvHashes.insert(make_pair(drvPath, drvHash)); | ||||
| 
 | ||||
|     state.drvRoots[drvPath] = ne.closure.roots; | ||||
| 
 | ||||
|  | @ -118,7 +118,7 @@ static void processBinding(EvalState & state, Expr e, StoreExpr & ne, | |||
|             PathSet drvRoots; | ||||
|             drvRoots.insert(evalPath(state, a)); | ||||
|              | ||||
|             state.drvHashes[drvPath] = drvHash; | ||||
|             state.drvHashes.insert(make_pair(drvPath, drvHash)); | ||||
|             state.drvRoots[drvPath] = drvRoots; | ||||
| 
 | ||||
|             ss.push_back(addInput(state, drvPath, ne)); | ||||
|  | @ -188,7 +188,7 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args) | |||
|     ne.type = StoreExpr::neDerivation; | ||||
| 
 | ||||
|     string drvName; | ||||
|     Hash outHash; | ||||
|     Hash outHash(htMD5); | ||||
|     bool outHashGiven = false; | ||||
| 
 | ||||
|     for (ATermIterator i(attrs.keys()); i; ++i) { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue