← Back to branch summary

~ubuntu-branches/ubuntu/quantal/wicd/quantal

« back to all changes in this revision

Viewing changes to wicd/wicd-daemon.py

  • Committer: Bazaar Package Importer
  • Author(s): David Paleino
  • Date: 2009-02-08 14:57:56 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090208145756-3arymyctltokm5gi
Tags: 1.5.9-1
http://bugs.debian.org/512160
* New upstream release:
  - Fixed security hole in DBus configuration file
  - Fixed the TTLS template
* debian/patches/:
  - 05-fix_DBus_policy.patch added, allow only members of the netdev
    group to configure wicd (Closes: #512160)
* debian/postinst: add group "netdev", which will be the only one able
  to configure wicd
* debian/control: added dependency on adduser
* debian/NEWS.Debian and debian/docs added, explain the new permissions
  policy

Show diffs side-by-side

added added

removed removed

Lines of Context:
wicd/wicd-daemon.py
205
205
 
206
206
        """
207
207
        # VERSIONNUMBER
208
 
        version = '1.5.8'
 
208
        version = '1.5.9'
209
209
        print 'returned version number', version
210
210
        return version
211
211
 
756
756
            print "Setting script properties through the daemon is not" \
757
757
                  + " permitted."
758
758
            return False
 
759
        if isinstance(value, basestring):
 
760
            value = misc.to_unicode(value)
759
761
        self.LastScan[networkid][prop] = misc.Noneify(value)
760
762
    #end function SetProperty
761
763
 
1236
1238
        bssid_key = cur_network["bssid"]
1237
1239
        if self.debug_mode:
1238
1240
            print bssid_key
1239
 
        if config.has_section(essid_key)and \
1240
 
           misc.stringToNone(config.get(essid_key, 'use_settings_globally')):
 
1241
        try:
 
1242
            if config.has_section(essid_key)and \
 
1243
               misc.stringToNone(config.get(essid_key, 'use_settings_globally')):
1241
1244
                return self._read_wireless_profile(config, cur_network, 
1242
1245
                                                   essid_key)
1243
 
        elif config.has_section(bssid_key):
 
1246
        except ConfigParser.NoOptionError:
 
1247
            pass
 
1248
        if config.has_section(bssid_key):
1244
1249
            return self._read_wireless_profile(config, cur_network, bssid_key)
1245
1250
        else:
1246
1251
            cur_network["has_profile"] = False
1505
1510
def usage():
1506
1511
    # VERSIONNUMBER
1507
1512
    print """
1508
 
wicd 1.5.8
 
1513
wicd 1.5.9
1509
1514
wireless (and wired) connection daemon.
1510
1515
 
1511
1516
Arguments: