From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 15 Aug 2008 18:14:03 +0000 (+0000)
Subject: Add some output to get_package_source
X-Git-Tag: 1.0~27
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=3772879ebdf452eeb9e8e2c04c07338c4933a3ed;p=builder.git

Add some output to get_package_source
Redirect stderr to /dev/null in run_command
---

diff --git a/source/builder.cpp b/source/builder.cpp
index 58288ff..b77b8fc 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -481,6 +481,9 @@ and if it fails, the package path is searched for matches.
 */
 FS::Path Builder::get_package_location(const string &name)
 {
+	if(verbose>=3)
+		cout<<"Looking for package "<<name<<'\n';
+
 	// Try to get source directory with pkgconfig
 	list<string> argv;
 	argv.push_back("pkg-config");
@@ -504,6 +507,8 @@ FS::Path Builder::get_package_location(const string &name)
 					pkg_dirs.push_back(full);
 			}
 		}
+		if(verbose>=3)
+			cout<<pkg_dirs.size()<<" packages found in path\n";
 	}
 
 	bool msp=!name.compare(0, 3, "msp");
diff --git a/source/misc.cpp b/source/misc.cpp
index a299f0e..ab61d9f 100644
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include <iostream>
 #include <sys/wait.h>
+#include <fcntl.h>
 #include <cstdlib>
 #include <cstring>
 #include "misc.h"
@@ -37,7 +38,10 @@ string run_command(const StringList &argv)
 
 		close(pfd[0]);
 		dup2(pfd[1], 1);
-		dup2(pfd[1], 2);
+		close(pfd[1]);
+		int devnull=open("/dev/null", O_WRONLY);
+		dup2(devnull, 2);
+		close(devnull);
 
 		execvp(argv_[0], argv_);
 		::exit(1);