download-via-ssh: Show where we're downloading from
This commit is contained in:
		
							parent
							
								
									dba33d4018
								
							
						
					
					
						commit
						4db572062c
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
					@ -109,7 +109,8 @@ void run(Strings args)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    std::cout << std::endl;
 | 
					    std::cout << std::endl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    std::pair<FdSink, FdSource> pipes = connect(settings.sshSubstituterHosts.front());
 | 
					    string host = settings.sshSubstituterHosts.front();
 | 
				
			||||||
 | 
					    std::pair<FdSink, FdSource> pipes = connect(host);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Exchange the greeting */
 | 
					    /* Exchange the greeting */
 | 
				
			||||||
    writeInt(SERVE_MAGIC_1, pipes.first);
 | 
					    writeInt(SERVE_MAGIC_1, pipes.first);
 | 
				
			||||||
| 
						 | 
					@ -130,6 +131,7 @@ void run(Strings args)
 | 
				
			||||||
        else {
 | 
					        else {
 | 
				
			||||||
            Path storePath = *++i;
 | 
					            Path storePath = *++i;
 | 
				
			||||||
            Path destPath = *++i;
 | 
					            Path destPath = *++i;
 | 
				
			||||||
 | 
					            printMsg(lvlError, format("downloading `%1%' via SSH from `%2%'...") % storePath % host);
 | 
				
			||||||
            substitute(pipes, storePath, destPath);
 | 
					            substitute(pipes, storePath, destPath);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue