- fixed #419144

- fixed new_conf_template: commented out new 'http_headers' options

osc/commandline.py

@@ -76,7 +76,7 @@ class Osc(cmdln.Cmdln):
             config['user'] = raw_input('Username: ')
             config['pass'] = getpass.getpass()
 
-            conf.write_initial_config(e.file, config, True)
+            conf.write_initial_config(e.file, config)
             print >>sys.stderr, 'done'
             if try_again: self.postoptparse(try_again = False)
         except oscerr.ConfigMissingApiurl, e:

osc/conf.py

@@ -115,9 +115,8 @@ new_conf_template = """
 user = %(user)s
 pass = %(pass)s
 # additional headers to pass to a request, e.g. for special authentication
-http_headers = Host: foofoobar,
-       User: mumblegack
-],
+#http_headers = Host: foofoobar,
+#       User: mumblegack
 """