Hello community, here is the log from the commit of package cnetworkmanager for openSUSE:Factory checked in at Sat Aug 22 03:11:16 CEST 2009. -------- --- cnetworkmanager/cnetworkmanager.changes 2009-08-12 16:06:06.000000000 +0200 +++ cnetworkmanager/cnetworkmanager.changes 2009-08-18 16:10:07.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 18 15:40:06 CEST 2009 - mvidner@suse.cz + +- Fixed the --wep-* and --wpa-* options (Gentoo#281099). +- Fixed --activate-connection failing with Invalid settings service name. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cnetworkmanager-0.21.tar.gz New: ---- cnetworkmanager-0.21.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cnetworkmanager.spec ++++++ --- /var/tmp/diff_new_pack.XIzBKm/_old 2009-08-22 03:10:56.000000000 +0200 +++ /var/tmp/diff_new_pack.XIzBKm/_new 2009-08-22 03:10:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cnetworkmanager (Version 0.21) +# spec file for package cnetworkmanager (Version 0.21.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: cnetworkmanager -Version: 0.21 +Version: 0.21.1 Release: 1 Summary: Command-line client for NetworkManager License: GPL v2 or later ++++++ cnetworkmanager-0.21.tar.gz -> cnetworkmanager-0.21.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/Makefile new/cnetworkmanager-0.21.1/Makefile --- old/cnetworkmanager-0.21/Makefile 2009-08-05 11:30:56.000000000 +0200 +++ new/cnetworkmanager-0.21.1/Makefile 2009-08-13 23:52:55.000000000 +0200 @@ -7,7 +7,7 @@ check-nonm: for T in `find . -name \*.py | xargs grep -l '>>>'`; do python $$T; done - for T in test/test01*.py; do $$T; done + for T in test/test01*.py; do PYTHONPATH=. $$T; done install: $(SETUP) install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/NEWS new/cnetworkmanager-0.21.1/NEWS --- old/cnetworkmanager-0.21/NEWS 2009-08-10 21:56:59.000000000 +0200 +++ new/cnetworkmanager-0.21.1/NEWS 2009-08-18 15:39:40.000000000 +0200 @@ -1,3 +1,8 @@ +0.21.1, Tue 2009-08-18 +Fixed the --wep-* and --wpa-* options (Gentoo#281099). +Fixed --activate-connection failing with Invalid settings service name. +openSUSE 11.2: noarch again. + 0.21, Mon 2009-08-10 User visible: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/PKG-INFO new/cnetworkmanager-0.21.1/PKG-INFO --- old/cnetworkmanager-0.21/PKG-INFO 2009-08-10 23:21:07.000000000 +0200 +++ new/cnetworkmanager-0.21.1/PKG-INFO 2009-08-18 15:45:38.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cnetworkmanager -Version: 0.21 +Version: 0.21.1 Summary: NetworkManager library and CLI Home-page: http://vidner.net/martin/software/cnetworkmanager/ Author: Martin Vidner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/cnetworkmanager new/cnetworkmanager-0.21.1/cnetworkmanager --- old/cnetworkmanager-0.21/cnetworkmanager 2009-08-08 15:32:50.000000000 +0200 +++ new/cnetworkmanager-0.21.1/cnetworkmanager 2009-08-18 15:41:51.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/python -VERSION = "0.21" +VERSION = "0.21.1" import sys import time @@ -197,16 +197,18 @@ #def is_opath(x): # return is_instance(x, str) and x[0] == "/" -# move this to networkmanagersettings -def get_connection(svc, conn_spec): +def get_service_name(svc): if svc == "" or svc == "user": svc = USER_SERVICE elif svc == "system": svc = SYSTEM_SERVICE + return svc +# move this to networkmanagersettings +def get_connection(svc, conn_spec): # if is_opath(conn_spec): # return conn_spec - applet = NetworkManagerSettings(svc) + applet = NetworkManagerSettings(get_service_name(svc)) for conn in applet.ListConnections(): cs = conn.GetSettings() if cs["connection"]["id"] == conn_spec: @@ -218,7 +220,7 @@ cs = conn.GetSettings() return cs["connection"]["type"] -def list_conections(svc): +def list_connections(svc): acs = nm["ActiveConnections"] acos = map(lambda a: a["Connection"].object_path, acs) @@ -235,9 +237,9 @@ print t if options.usrcon: - list_conections(USER_SERVICE) + list_connections(USER_SERVICE) if options.syscon: - list_conections(SYSTEM_SERVICE) + list_connections(SYSTEM_SERVICE) if options.con_info != None: (svc, con) = ("", options.con_info) @@ -313,6 +315,7 @@ if options.activate_connection != None: (svc, conpath, devpath, appath) = options.activate_connection.split(',') + svc = get_service_name(svc) conn = get_connection(svc, conpath) hint = get_connection_devtype(conn) dev = get_device(devpath, hint) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/networkmanager/applet/settings.py new/cnetworkmanager-0.21.1/networkmanager/applet/settings.py --- old/cnetworkmanager-0.21/networkmanager/applet/settings.py 2009-07-30 21:56:58.000000000 +0200 +++ new/cnetworkmanager-0.21.1/networkmanager/applet/settings.py 2009-08-13 23:52:55.000000000 +0200 @@ -104,7 +104,7 @@ def __init__(self, ssid, key, hashed_key=""): "One of key, hashed_key must be present" - super(WiFi, self).__init__(ssid) + super(Wep, self).__init__(ssid) self["802-11-wireless"]["security"] = "802-11-wireless-security" self["802-11-wireless-security"] = {} self["802-11-wireless-security"]["key-mgmt"] = "none" @@ -126,10 +126,10 @@ def __init__(self, ssid, key, hashed_key=""): "One of key, hashed_key must be present" - super(WiFi, self).__init__(ssid) + super(WpaPsk, self).__init__(ssid) self["802-11-wireless"]["security"] = "802-11-wireless-security" self["802-11-wireless-security"] = {} - self["802-11-wireless-security"]["group"] = ["tkip", "cselfp"] + self["802-11-wireless-security"]["group"] = ["tkip", "ccmp"] self["802-11-wireless-security"]["pairwise"] = ["tkip", "ccmp"] self["802-11-wireless-security"]["key-mgmt"] = "wpa-psk" if hashed_key == "": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/setup.py new/cnetworkmanager-0.21.1/setup.py --- old/cnetworkmanager-0.21/setup.py 2009-08-08 15:33:45.000000000 +0200 +++ new/cnetworkmanager-0.21.1/setup.py 2009-08-18 15:42:04.000000000 +0200 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name = 'cnetworkmanager', - version = '0.21', + version = '0.21.1', description = 'NetworkManager library and CLI', author = 'Martin Vidner', author_email = 'martin@vidner.net', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cnetworkmanager-0.21/test/test01-nofail.py new/cnetworkmanager-0.21.1/test/test01-nofail.py --- old/cnetworkmanager-0.21/test/test01-nofail.py 2009-07-30 21:56:58.000000000 +0200 +++ new/cnetworkmanager-0.21.1/test/test01-nofail.py 2009-08-13 23:52:55.000000000 +0200 @@ -4,6 +4,8 @@ import sys import unittest +import networkmanager.applet.settings as settings + class NoFail(unittest.TestCase): def callIt(self, params): cmd = sys.path[0] + '/../cnetworkmanager' @@ -19,5 +21,21 @@ def testHelp(self): self.callIt("--help") +class SettingsFactory(unittest.TestCase): + def testWiFi(self): + ssid = "foo" + c = settings.WiFi(ssid) + + def testWep(self): + ssid = "foo" + c1 = settings.Wep(ssid, "wep_pass") + c2 = settings.Wep(ssid, "", "ffffffffffffffffffffffffff") + + def testWpa(self): + ssid = "foo" + c1 = settings.WpaPsk(ssid, "wep_pass") + c2 = settings.WpaPsk(ssid, "", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") + + if __name__ == '__main__': unittest.main() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org