Skip to content

Displayed a more comprehensive error message if the base directory does not exist #84

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Displayed a more comprehensive error message if the base directory does not exist #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc749b5
Displayed a more comprehensive error message if the base directory do…
oliviermartin Oct 16, 2015
1a037cd
Force the base directory to be an absolute path
oliviermartin Oct 16, 2015
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
10 changes: 9 additions & 1 deletion git-ftp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,15 @@ def main():
raise FtpSslNotSupported("Python is too old for FTP SSL. Try using Python 2.7 or later.")
else:
ftp = ftplib.FTP(options.ftp.hostname, options.ftp.username, options.ftp.password)
ftp.cwd(base)

# Make the base directory an absolute path - it is required for the subsequent steps
if base[0] != '/':
base = os.path.join(ftp.pwd(), base)

try:
ftp.cwd(base)
except ftplib.error_perm:
raise ValueError("FTP base directory '%s' does not exist on this server (note: the server session starts at '%s')" % (base, ftp.pwd()))

# Check revision
hash = options.revision
Expand Down