Merge lp:~jml/launchpad/sftp-poppy-for-real into lp:launchpad

[Jonathan Lange]

Stuff I've done working on Poppy SFTP

=== modified file 'lib/lp/poppy/daemon.py'
--- lib/lp/poppy/daemon.py	2010-03-17 12:26:14 +0000
+++ lib/lp/poppy/daemon.py	2010-04-15 16:23:49 +0000
@@ -26,11 +26,6 @@
                       default='ubuntu',
                       help="Username allowed to log in.")
 
-    parser.add_option("--permissions", action="store", metavar="PERMS",
-                      default='g+rwxs',
-                      help="Permissions to chmod the targetfsroot with "
-                      "before letting go of the directory.")
-
     options, args = parser.parse_args()
 
     log = logger(options, "poppy-upload")
@@ -43,9 +38,10 @@
     host = "0.0.0.0"
     ident = "lucille upload server"
     numthreads = 4
+    permissions = 'g+rwxs'
 
     hooks = Hooks(root, log, allow_user=options.allow_user, cmd=options.cmd,
-                  perms=options.permissions)
+                  perms=permissions)
 
     run_server(host, int(port), ident, numthreads,
                hooks.new_client_hook, hooks.client_done_hook,

=== modified file 'lib/lp/poppy/tests/helpers.py'
--- lib/lp/poppy/tests/helpers.py	2010-03-18 11:16:55 +0000
+++ lib/lp/poppy/tests/helpers.py	2010-04-15 16:23:49 +0000
@@ -36,6 +36,9 @@
     def startPoppy(self):
         """Start the poppy instance."""
         script = os.path.join(config.root, "daemons/poppy-upload.py")
+        # XXX: This is the only use of --cmd for poppy, and it's there to make
+        # sure that the tests can tell for sure when poppy is finished.
+        # XXX: This is also the only use of --allow-user.
         self.process = subprocess.Popen(
             [sys.executable, script, "--allow-user", self.user,
              "--cmd", self.cmd, self.fsroot, self.port],