From 382834391ba82f745024a2cdbb66cf8edfbfd12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <lool@dooz.org>
Date: Mon, 4 Jan 2010 23:55:50 +0100
Subject: Normalize output of get_build_deps(), _conflicts()

---
 pbuilder-satisfydepends-funcs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'pbuilder-satisfydepends-funcs')

diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 5c43e34..78fb683 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -85,17 +85,23 @@ p' \
 }
 
 get_build_deps() {
-    get_source_control_field "Build-Depends"
+    local output
+
+    output="`get_source_control_field "Build-Depends"`"
     if [ "$BINARY_ARCH" = no ]; then
-        get_source_control_field "Build-Depends-Indep"
+        output="${output:+$output, }`get_source_control_field "Build-Depends-Indep"`"
     fi
+    echo "$output"
 }
 
 get_build_conflicts() {
-    get_control_field "Build-Conflicts"
+    local output
+
+    output="`get_control_field "Build-Conflicts"`"
     if [ "$BINARY_ARCH" = no ]; then
-        get_source_control_field "Build-Conflicts-Indep"
+        output="${output:+$output, }`get_source_control_field "Build-Conflicts-Indep"`"
     fi
+    echo "$output"
 }
 
 checkbuilddep_archdeps() {
-- 
cgit v1.2.3