* usr/bin/byobu-config, usr/bin/byobu-select-session:

- use python's default parameter for os.getenv(), LP: #816026
This commit is contained in:
Dustin Kirkland 2011-07-28 00:32:13 -05:00
commit 812aa0ef40
3 changed files with 8 additions and 9 deletions

2
debian/changelog vendored
View file

@ -19,6 +19,8 @@ byobu (4.23) unreleased; urgency=low
- reuse the get_network_interface function across network operations - reuse the get_network_interface function across network operations
* usr/lib/byobu/updates_available: * usr/lib/byobu/updates_available:
- support package kit, LP: #815579 - support package kit, LP: #815579
* usr/bin/byobu-config, usr/bin/byobu-select-session:
- use python's default parameter for os.getenv(), LP: #816026
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 24 Jul 2011 14:23:38 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 24 Jul 2011 14:23:38 -0500

View file

@ -29,13 +29,10 @@ from snack import *
PKG="byobu" PKG="byobu"
HOME=os.getenv("HOME") HOME=os.getenv("HOME")
USER=os.getenv("USER") USER=os.getenv("USER")
BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR") BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR", HOME+"/.byobu")
BYOBU_BACKEND=os.getenv("BYOBU_BACKEND") BYOBU_BACKEND=os.getenv("BYOBU_BACKEND", "screen")
SOCKETDIR=os.getenv("SOCKETDIR") SOCKETDIR=os.getenv("SOCKETDIR", "/var/run/screen")
if os.getenv("BYOBU_PREFIX"): PREFIX = os.getenv("BYOBU_PREFIX", "/usr")
PREFIX = os.getenv("BYOBU_PREFIX")
else:
PREFIX = "/usr"
SHARE=PREFIX+'/share/'+PKG SHARE=PREFIX+'/share/'+PKG
DOC=PREFIX+'/share/doc/'+PKG DOC=PREFIX+'/share/doc/'+PKG
if not os.path.exists(SHARE): if not os.path.exists(SHARE):

View file

@ -23,8 +23,8 @@ import commands, os, re, sys
PKG = "byobu" PKG = "byobu"
SHELL = os.getenv("SHELL", "/bin/bash") SHELL = os.getenv("SHELL", "/bin/bash")
HOME=os.getenv("HOME") HOME=os.getenv("HOME")
BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR") BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR", HOME+"/.byobu")
BYOBU_BACKEND=os.getenv("BYOBU_BACKEND") BYOBU_BACKEND=os.getenv("BYOBU_BACKEND", "screen")
choice = "" choice = ""
sessions = [] sessions = []
text = [] text = []