--- a/src/tests/cli/t_pkgsend.py	Tue Nov 17 17:06:35 2009 -0600
+++ b/src/tests/cli/t_pkgsend.py	Wed Nov 18 15:53:48 2009 -0800
@@ -55,10 +55,11 @@
                 dfurl = "file://%s" % self.dc.get_repodir()
 
                 for url in (dhurl, dfurl):
-                        self.pkgsend_bulk(url,
+                        for line in \
                             """open [email protected],5.11-0
                             add dir mode=0755 owner=root group=bin path=/bin
-                            close -A""")
+                            close -A""".splitlines():
+                                self.pkgsend(url, line)
 
                         if url == dfurl:
                                 # Must restart pkg.depotd so it will pickup the
@@ -493,8 +494,8 @@
                                 # to be incremented.
                                 p2 = p.replace("<ver>", str(ver))
                                 self.pkgsend_bulk(url, p2, exit=exit)
-                                if exit:
-                                        self.pkgsend(url, "close -A")
+                                #if exit:
+                                #        self.pkgsend(url, "close -A")
 
                                 # Then do it line-by-line
                                 for i, l in enumerate(p.splitlines()):