Remove unused flexibility from the spool option parsing code.

1 files changed, 5 insertions, 5 deletions

diff --git a/rainbow/bin/rainbow-run b/rainbow/bin/rainbow-run
index 99eb16f..3ce2590 100755
--- a/rainbow/bin/rainbow-run
+++ b/rainbow/bin/rainbow-run
@@ -53,8 +53,8 @@ def main():
 
     report = make_reporter(opts.verbose, opts.quiet, sys.stdout)
 
-    def check_spool(opts, home):
-        return opts.spool or join(pwd.getpwnam('rainbow').pw_dir, 'spool-2')
+    def check_spool(opts):
+        return opts.spool
 
     def check_env(opts):
         return read_envdir(opts.envdir, opts.env)
@@ -70,7 +70,7 @@ def main():
 
     def check_owner(opts):
         p = pwd.getpwnam(opts.user)
-        return p.pw_uid, p.pw_gid, p.pw_dir
+        return p.pw_uid, p.pw_gid
 
     def check_groups(opts):
         return [grp.getgrnam(g)[2] for g in opts.group]
@@ -106,8 +106,8 @@ def main():
     def check_assistant(opts):
         return opts.assistant
 
-    uid, gid, home = check_owner(opts)
-    spool = check_spool(opts, home)
+    uid, gid = check_owner(opts)
+    spool = check_spool(opts)
 
     # Use empty env? Use partial env? Fail unless perfect?
     env = check_env(opts)