From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Wed, 10 Apr 2013 15:44:55 +0000 (+0300)
Subject: diff-packages: allow reading credentials from ~/.swuprc file
X-Git-Tag: accepted/trunk/20130411.085358~1^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa5ec18b017af29f81b40048eafde7d31828f8b9;p=platform%2Fupstream%2Fswup.git

diff-packages: allow reading credentials from ~/.swuprc file

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

diff --git a/tools/getpacs/diff-packages.py b/tools/getpacs/diff-packages.py
index a3d9532..871fa3d 100755
--- a/tools/getpacs/diff-packages.py
+++ b/tools/getpacs/diff-packages.py
@@ -6,14 +6,14 @@ import urllib2
 from optparse import OptionParser
 import os
 import re, base64
-import configparser
+import ConfigParser
 
 username = ""
 password = ""
 
 def read_config(config_file):
-    config_file = os.path.userexpand(config_file)
-    parser = configparser.SafeConfigParser()
+    config_file = os.path.expanduser(config_file)
+    parser = ConfigParser.SafeConfigParser()
     parser.read(config_file)
     return parser
 
@@ -98,7 +98,7 @@ parser.add_option("-p", "--password",  dest="password", metavar="PASSWD", help="
 
 (options, args) = parser.parse_args()
 
-config = parse_config('~/.swuprc')
+config = read_config('~/.swuprc')
 
 DAILY="/pc/releases/daily/trunk"
 WEEKLY="/pc/releases/weekly/trunk"
@@ -112,8 +112,14 @@ if options.type == "weekly":
 else:
     release_url = "%s/%s" %(BASE, SNAPSHOTS)
 
-username = options.username
-password = options.password
+if options.username:
+    username = options.username
+elif config.has_option('DEFAULT', 'username'):
+    username = config.get('DEFAULT', 'username')
+if options.password:
+    password = options.password
+elif config.has_option('DEFAULT', 'password'):
+    password = config.get('DEFAULT', 'password')
 
 p1 = get_package_list2(options.image, release_url, options.old)
 p2 = get_package_list2(options.image, release_url, options.new)