* When doing "nix-store --add-fixed" without "--recursive" via the Nix
daemon (which is an error), print a nicer error message than "Connection reset by peer" or "broken pipe". * In the daemon, log errors that occur during request parameter processing.
This commit is contained in:
		
							parent
							
								
									be9be4c147
								
							
						
					
					
						commit
						24f863d86b
					
				
					 3 changed files with 16 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -328,7 +328,7 @@ Path RemoteStore::addToStore(const Path & _srcPath,
 | 
			
		|||
    openConnection();
 | 
			
		||||
    
 | 
			
		||||
    Path srcPath(absPath(_srcPath));
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    writeInt(wopAddToStore, to);
 | 
			
		||||
    writeString(baseNameOf(srcPath), to);
 | 
			
		||||
    /* backwards compatibility hack */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -151,9 +151,7 @@ public:
 | 
			
		|||
    
 | 
			
		||||
    /* Copy the contents of a path to the store and register the
 | 
			
		||||
       validity the resulting path.  The resulting path is returned.
 | 
			
		||||
       If `fixed' is true, then the output of a fixed-output
 | 
			
		||||
       derivation is pre-loaded into the Nix store.  The function
 | 
			
		||||
       object `filter' can be used to exclude files (see
 | 
			
		||||
       The function object `filter' can be used to exclude files (see
 | 
			
		||||
       libutil/archive.hh). */
 | 
			
		||||
    virtual Path addToStore(const Path & srcPath,
 | 
			
		||||
        bool recursive = true, HashType hashAlgo = htSHA256,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue