unified the default values of all config keys

diff --git a/README.rst b/README.rst
index ef7642de38fa7066190b9811fcd7e8b562716462..80c1f094533fb8369934bcec4cca0c7b7c729d33 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -165,13 +165,21 @@ configuration file by yourself.  Just make sure it looks like as below:
   ; settings for build subcommand
   build_server = <OBS API URL>
   user = <USER_NAME>
-  passwd  = <PASSWORD in base64 string>
-  passwdx = <PASSWORD encoded in base64 string>
+  passwd  = <PASSWORD in plaintext> (will be updated w/ base64 encoded one)
+
   [build]
   build_cmd = /usr/bin/build
   build_root= /var/tmp/build-root-gbs
-  su-wrapper= su -c
+  su-wrapper= sudo
   distconf=/usr/share/gbs/tizen-1.0.conf
+  repo1.url=
+  repo1.user=
+  repo1.passwd=
+  repo1.passwdx=
+  repo2.url=
+  repo2.user=
+  repo2.passwd=
+  repo2.passwdx=
   [import]
   commit_name= <Author Name>
   commit_email= <Author Email>

diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index c6ea41da40c51a671dc79c49fb15239a896c7beb..9ab15c223d73c49727b128d0eaa9d65ba22e061d 100644 (file)
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -231,8 +231,8 @@ class ConfigMgr(object):
                 'distconf':     '/usr/share/gbs/tizen-1.0.conf',
             },
             'import': {
-                'commit_name':    None,
-                'commit_email':   None,
+                'commit_name':    '',
+                'commit_email':   '',
             },
 
     }
@@ -246,22 +246,25 @@ editor =
 build_server = $remotebuild__build_server
 user = $remotebuild__user
 passwdx = $remotebuild__passwdx
+
 [build]
-build_cmd = /usr/bin/build
-build_root= /var/tmp/build-root-gbs
-su-wrapper= sudo
+build_cmd = $build__build_cmd
+build_root = $build__build_root
+su_wrapper = $build__su_wrapper
+distconf = $build__distconf
+
+; optional, repos definitions
 repo1.url=
 repo1.user=
 repo1.passwd=
-repo1.passwdx=
 repo2.url=
 repo2.user=
 repo2.passwd=
-repo2.passwdx=
 distconf= /usr/share/gbs/tizen-1.0.conf
 [import]
-commit_name=
-commit_email=
+; optional, for git author information
+commit_name = $import__commit_name
+commit_email = $import__commit_email
 """
 
     # make the manager class as singleton