← Back to branch summary

~glatzor/+junk/maverik-updates

« back to all changes in this revision

Viewing changes to .pc/03_auth_me_less.patch/aptdaemon/core.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-07-26 08:45:23 UTC
  • mfrom: (1.1.25 upstream)
  • Revision ID: james.westby@ubuntu.com-20100726084523-qvk6viriz11hmo1u
Tags: 0.31+bzr447-0ubuntu1
* new bzr snapshot
* drop 01_vendor-keys-download.patch, taken upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/03_auth_me_less.patch/aptdaemon/core.py
512
512
            self.locale = "%s.%s" % (lang, encoding)
513
513
            self.PropertyChanged("locale", self.locale)
514
514
 
515
 
    def _set_http_proxy(self, url):
 
515
    @inline_callbacks
 
516
    def _set_http_proxy(self, url, sender):
516
517
        """Set an http network proxy.
517
518
 
518
519
        Keyword arguments:
520
521
        """
521
522
        if url != "" and (not url.startswith("http://") or not ":" in url):
522
523
            raise errors.InvalidProxyError(proxy)
 
524
        action = policykit1.PK_ACTION_SET_PROXY
 
525
        yield policykit1.check_authorization_by_name(sender, action)
523
526
        self.http_proxy = url
524
527
        self.PropertyChanged("HttpProxy", self.http_proxy)
525
528
 
614
617
        yield self._check_foreign_user(sender)
615
618
        self.depends, self._dpkg_status, self.download, self.space = \
616
619
                self.queue.worker.simulate(self, self.queue.future_status)
 
620
        if self._idle_watch is not None:
 
621
            gobject.source_remove(self._idle_watch)
 
622
            self._idle_watch = None
617
623
 
618
624
    def _set_terminal(self, ttyname):
619
625
        """Set the controlling terminal.
764
770
            elif property == "AllowUnauthenticated":
765
771
                self._set_allow_unauthenticated(value)
766
772
            elif property == "HttpProxy":
767
 
                self._set_http_proxy(value)
 
773
                self._set_http_proxy(value, sender)
768
774
            else:
769
775
                raise dbus.exceptions.DBusException("Unknown or read only "
770
776
                                                    "property: %s" % property)