aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2010-01-05 16:13:03 +0100
committerLoïc Minier <lool@dooz.org>2010-01-05 16:13:03 +0100
commit30fbb4ee6fc71ea69ba7bd16441a9be46a53b456 (patch)
treead59115ff3009e3526ee55b516e8080d7354c2d2
parentc7f3bdfd896bbe42a0885c6ae7a1c5ed830bf68a (diff)
downloadpbuilder-30fbb4ee6fc71ea69ba7bd16441a9be46a53b456.tar
pbuilder-30fbb4ee6fc71ea69ba7bd16441a9be46a53b456.tar.gz
Fix extra slashes in split_deps() output
-rwxr-xr-xpbuilder-satisfydepends-classic2
-rwxr-xr-xtest_pbuilder-satisfydepends-classic48
2 files changed, 25 insertions, 25 deletions
diff --git a/pbuilder-satisfydepends-classic b/pbuilder-satisfydepends-classic
index 280ae80..899f5f2 100755
--- a/pbuilder-satisfydepends-classic
+++ b/pbuilder-satisfydepends-classic
@@ -31,7 +31,7 @@ export PBUILDER_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder
# first as to iterate on deps with "for"; e.g. "foo, bar | baz", "foobar (>=
# 2)" becomes "foo", "bar/|/baz", "foobar/(>=/2)"
split_deps() {
- tr " " "/" | awk 'BEGIN{RS=","} {print}'
+ sed 's#, *#\n#g; s# #/#g'
}
# and build-conflicts
diff --git a/test_pbuilder-satisfydepends-classic b/test_pbuilder-satisfydepends-classic
index f38882a..8a1eaea 100755
--- a/test_pbuilder-satisfydepends-classic
+++ b/test_pbuilder-satisfydepends-classic
@@ -34,29 +34,29 @@ test_split_deps() {
}
expect_output "debhelper/(>=/5.0.0)
-/gnome-pkg-tools
-/autotools-dev
-/cdbs
-/libglib2.0-dev/(>=/2.12)
-/libgtk2.0-dev/(>=/2.10)
-/libgnome2-dev/(>=/2.16.0)
-/libgnomeui-dev/(>=/2.16.0)
-/libglade2-dev
-/libgnomevfs2-dev/(>=/2.9.2)
-/libgconf2-dev
-/libxft-dev
-/libperl-dev
-/python-dev
-/tcl8.4-dev
-/libxml-parser-perl
-/libdbus-glib-1-dev/(>=/0.60)
-/libtool
-/scrollkeeper
-/libgnutls-dev
-/libnotify-dev/(>=/0.3.2-0)
-/libsexy-dev/(>=/0.1.7)
-/gnome-doc-utils
-/libssl-dev/(>=/0.9.8b-1)
-/liblaunchpad-integration-dev" test_split_deps
+gnome-pkg-tools
+autotools-dev
+cdbs
+libglib2.0-dev/(>=/2.12)
+libgtk2.0-dev/(>=/2.10)
+libgnome2-dev/(>=/2.16.0)
+libgnomeui-dev/(>=/2.16.0)
+libglade2-dev
+libgnomevfs2-dev/(>=/2.9.2)
+libgconf2-dev
+libxft-dev
+libperl-dev
+python-dev
+tcl8.4-dev
+libxml-parser-perl
+libdbus-glib-1-dev/(>=/0.60)
+libtool
+scrollkeeper
+libgnutls-dev
+libnotify-dev/(>=/0.3.2-0)
+libsexy-dev/(>=/0.1.7)
+gnome-doc-utils
+libssl-dev/(>=/0.9.8b-1)
+liblaunchpad-integration-dev" test_split_deps
testlib_summary