Skip to content

delete misleading log output #27

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 2 commits into from
Feb 28, 2019
Merged

delete misleading log output #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f0bcd2
delete misleading log output
liuyongqing Feb 28, 2019
dd4c1e8
change cosfs version
liuyongqing Feb 28, 2019
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
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
dnl Process this file with autoconf to produce a configure script.

AC_PREREQ(2.59)
AC_INIT(cosfs, 1.0.9)
AC_INIT(cosfs, 1.0.10)
AC_CONFIG_HEADER([config.h])

AC_CANONICAL_SYSTEM
Expand Down
5 changes: 1 addition & 4 deletions src/s3fs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4879,10 +4879,7 @@ int main(int argc, char* argv[])
S3FS_PRN_EXIT("specifying both public_bucket and the access keys options is invalid.");
exit(EXIT_FAILURE);
}
if(passwd_file.size() > 0 && S3fsCurl::IsSetAccessKeyId()){
S3FS_PRN_EXIT("specifying both passwd_file and the access keys options is invalid.");
// exit(EXIT_FAILURE);
}

if(!S3fsCurl::IsPublicBucket()){
if(EXIT_SUCCESS != get_access_keys()){
exit(EXIT_FAILURE);
Expand Down