RSS

(root)/trunk : 408

Teddy Hogeborn
2009-11-11 01:25:22
Revision ID: teddy@fukt.bsnet.se-20091111002522-t416fifqw46xaqn4
* debian/rules: Only set BROKEN_PIE if binutils is a specific range of                 versions. * mandos-monitor (MandosClientWidget.keypress): Also accept "Ctrl-K"                                                 for removing client.   (UserInterface.__init__): Use non-bold line drawing charater.   (UserInterface.log_message): Scroll to bottom.   (UserInterface.process_input): Also show help on "ESC" key.

collapse all collapse all

added added

removed removed

15
# This has to be exported to make some magic below work.
15
# This has to be exported to make some magic below work.
16
export DH_OPTIONS
16
export DH_OPTIONS
17
 
17
 
18
# -pie is broken on the mips and mipsel architectures, see
18
# -pie was broken briefly on the mips and mipsel architectures, see
19
# <http://bugs.debian.org/526961>
19
# <http://bugs.debian.org/526961>
20
ifneq (,$(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:))
20
BINUTILS_V := $(shell dpkg-query --showformat='$${Version}' \
21
  BROKEN_PIE := yes
21
                        --show binutils)
22
  export BROKEN_PIE
22
ifeq (yes,$(shell dpkg --compare-versions $(BINUTILS_V) lt 2.20-3 \
23
endif
23
                && dpkg --compare-versions $(BINUTILS_V) ge 2.19.1-1 \
24
ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:))
24
                && echo yes))
25
  BROKEN_PIE := yes
25
  ifneq (,$(strip $(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:) \
26
  export BROKEN_PIE
26
                $(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:)))
 
 
27
    BROKEN_PIE := yes
 
 
28
    export BROKEN_PIE
 
 
29
  endif
27
endif
30
endif
28
 
31
 
29
configure: configure-stamp
32
configure: configure-stamp
150
            self.proxy.Enable()
150
            self.proxy.Enable()
151
        elif key == u"d" or key == u"-":
151
        elif key == u"d" or key == u"-":
152
            self.proxy.Disable()
152
            self.proxy.Disable()
153
        elif key == u"r" or key == u"_":
153
        elif key == u"r" or key == u"_" or key == u"ctrl k":
154
            self.server_proxy_object.RemoveClient(self.proxy
154
            self.server_proxy_object.RemoveClient(self.proxy
155
                                                  .object_path)
155
                                                  .object_path)
156
        elif key == u"s":
156
        elif key == u"s":
223
                ))
223
                ))
224
        
224
        
225
        if urwid.supports_unicode():
225
        if urwid.supports_unicode():
226
            #self.divider = u"─" # \u2500
226
            self.divider = u"─" # \u2500
227
            self.divider = u"━" # \u2501
227
            #self.divider = u"━" # \u2501
228
        else:
228
        else:
229
            #self.divider = u"-" # \u002d
229
            #self.divider = u"-" # \u002d
230
            self.divider = u"_" # \u005f
230
            self.divider = u"_" # \u005f
313
        if (self.max_log_length
313
        if (self.max_log_length
314
            and len(self.log) > self.max_log_length):
314
            and len(self.log) > self.max_log_length):
315
            del self.log[0:len(self.log)-self.max_log_length-1]
315
            del self.log[0:len(self.log)-self.max_log_length-1]
 
 
316
        self.logbox.set_focus(len(self.logbox.body.contents),
 
 
317
                              coming_from=u"above")
316
    
318
    
317
    def toggle_log_display(self):
319
    def toggle_log_display(self):
318
        """Toggle visibility of the log buffer."""
320
        """Toggle visibility of the log buffer."""
429
            elif key == u"w" or key == u"i":
431
            elif key == u"w" or key == u"i":
430
                self.change_log_display()
432
                self.change_log_display()
431
                self.refresh()
433
                self.refresh()
432
            elif key == u"?" or key == u"f1":
434
            elif key == u"?" or key == u"f1" or key == u"esc":
433
                if not self.log_visible:
435
                if not self.log_visible:
434
                    self.log_visible = True
436
                    self.log_visible = True
435
                    self.rebuild()
437
                    self.rebuild()

Loggerhead is a web-based interface for Bazaar branches