Skip to content

correct tmux session exceptions, fixes #162 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2016
Merged

correct tmux session exceptions, fixes #162 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tmuxp/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

import argcomplete
import kaptan

from libtmux.server import Server
from libtmux.common import has_required_tmux_version, which
from libtmux.exc import TmuxSessionExists
from libtmux.server import Server

from . import WorkspaceBuilder, config, exc, log, util
from .__about__ import __version__
Expand Down Expand Up @@ -283,7 +283,7 @@ def load_workspace(config_file, args):

if not args.detached:
builder.session.attach_session()
except exc.TmuxSessionExists as e:
except TmuxSessionExists as e:
if not args.detached and (
args.answer_yes or prompt_yes_no('%s Attach?' % e)
):
Expand Down
7 changes: 0 additions & 7 deletions tmuxp/exc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ class TmuxpException(Exception):
"""Base Exception for Tmuxp Errors."""


class TmuxSessionExists(TmuxpException):

"""Session does not exist in the server."""

pass


class ConfigError(TmuxpException):

"""Error parsing tmuxp configuration dict."""
Expand Down