diff -Nru powerline-0~20140216/debian/changelog powerline-0~20140216/debian/changelog --- powerline-0~20140216/debian/changelog 2014-02-23 13:28:14.000000000 -0600 +++ powerline-0~20140216/debian/changelog 2014-10-10 15:17:43.000000000 -0500 @@ -1,3 +1,10 @@ +powerline (0~20140216-1ubuntu1) utopic; urgency=medium + + * d/p/update_powerline_for_new_psutil.patch: + Fix psutil issues when using bash integration. + + -- Chris J Arges Fri, 10 Oct 2014 15:17:09 -0500 + powerline (0~20140216-1) unstable; urgency=low * Initial release. (Closes: #739666) diff -Nru powerline-0~20140216/debian/patches/series powerline-0~20140216/debian/patches/series --- powerline-0~20140216/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ powerline-0~20140216/debian/patches/series 2014-10-10 15:17:02.000000000 -0500 @@ -0,0 +1 @@ +update_powerline_for_new_psutil.patch diff -Nru powerline-0~20140216/debian/patches/update_powerline_for_new_psutil.patch powerline-0~20140216/debian/patches/update_powerline_for_new_psutil.patch --- powerline-0~20140216/debian/patches/update_powerline_for_new_psutil.patch 1969-12-31 18:00:00.000000000 -0600 +++ powerline-0~20140216/debian/patches/update_powerline_for_new_psutil.patch 2014-10-10 15:16:14.000000000 -0500 @@ -0,0 +1,31 @@ +From ecf26dfbc65e0c39001e8283e776c50899f90e1b Mon Sep 17 00:00:00 2001 +From: ZyX +Date: Thu, 13 Mar 2014 19:38:05 +0400 +Subject: [PATCH] Update powerline for new psutil + +Fixes #835 +--- + powerline/segments/common.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/powerline/segments/common.py b/powerline/segments/common.py +index 01c18a2..06f3d56 100644 +--- a/powerline/segments/common.py ++++ b/powerline/segments/common.py +@@ -517,8 +517,14 @@ def _get_interfaces(): + if data: + yield interface, data.bytes_recv, data.bytes_sent + +- def _get_user(segment_info): +- return psutil.Process(os.getpid()).username ++ # Pre psutil-2.0.0: psutil.Process.username has type property ++ if callable(psutil.Process.username): ++ def _get_user(segment_info): ++ return psutil.Process(os.getpid()).username() ++ # psutil-2.0.0: psutil.Process.username is unbound method ++ else: ++ def _get_user(segment_info): ++ return psutil.Process(os.getpid()).username + + class CPULoadPercentSegment(ThreadedSegment): + interval = 1