~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to base/mdns.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
303
303
                            key, value = result.split('=')
304
304
                            txt[key] = value
305
305
                        except ValueError:
306
 
                            pas
 
306
                            pass
307
307
 
308
308
                        off += l
309
309
 
310
310
                    log.debug("TXT: %s" % repr(txt))
311
 
                    y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % txt['ty']
 
311
                    try:
 
312
                        y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % txt['ty']
 
313
                    except KeyError:
 
314
                        log.debug("NO ty Key in txt: %s" % repr(txt))
312
315
 
313
316
                    if 'note' in txt:
314
317
                        y['note'] = txt['note']