slapos.package: Minor changes

Update Default Location, and minor style changes.

slapos/package/conf.py

@@ -47,7 +47,7 @@ class Parser(OptionParser):
     OptionParser.__init__(self, usage=usage, version=version,
                       option_list=[
         Option("--slapos-configuration",
-               default='/etc/opt/slapos/update.cfg',
+               default='/etc/opt/update.cfg',
                help="Path to slapos configuration file"),
         Option("--key",
                default="slapos-generic-key",
@@ -94,6 +94,7 @@ def do_conf():
   """Generate Default Configuration file """
   usage = "usage: %s [options] " % sys.argv[0]
   run_config(Config(Parser(usage=usage).check_args()))
+  sys.exit()
 
 def run_config(config):
   if os.path.exists(config.slapos_configuration):
@@ -112,5 +113,3 @@ def run_config(config):
                 "slapos_location": config.slapos_location
         })
 
-  sys.exit()
-

slapos/package/signature.py

-#!/usr/bin/python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

slapos/package/update.py

@@ -46,7 +46,7 @@ class Parser(OptionParser):
     OptionParser.__init__(self, usage=usage, version=version,
                       option_list=[
         Option("--slapos-configuration",
-               default='/etc/opt/slapos/slapos.cfg',
+               default='/etc/opt/update.cfg',
                help="Path to slapos configuration file"),
         Option("--srv-file",
                default='/srv/slapupdate',

slapos/package/upload_key.py

@@ -52,7 +52,7 @@ class Parser(OptionParser):
     OptionParser.__init__(self, usage=usage, version=version,
                       option_list=[
         Option("--slapos-configuration",
-               default='/etc/opt/slapos/slapos.cfg',
+               default='/etc/opt/update.cfg',
                help="Configuration File used to upload the key."),
         Option("--upgrade-file",
                default='/etc/opt/slapos/slapos-upgrade',