Skip to content

Fixes #1151 #1158

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 8, 2015
Merged

Fixes #1151 #1158

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
10 changes: 5 additions & 5 deletions qiita_db/metadata_template/base_metadata_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,9 +703,9 @@ def _add_common_extend_steps_to_queue(self, md_template, conn_handler,

if existing_samples:
warnings.warn(
"No values have been modified for samples '%s'. However, "
"the following columns have been added to them: '%s'"
% (", ".join(existing_samples), ", ".join(new_cols)),
"No values have been modified for existing samples (%s). "
"However, the following columns have been added to them: "
"'%s'" % (len(existing_samples), ", ".join(new_cols)),
QiitaDBWarning)
# The values for the new columns are the only ones that get
# added to the database. None of the existing values will be
Expand All @@ -727,8 +727,8 @@ def _add_common_extend_steps_to_queue(self, md_template, conn_handler,
conn_handler.add_to_queue(queue_name, sql, values, many=True)
elif existing_samples:
warnings.warn(
"The following samples already exist in the template and "
"will be ignored: %s" % ", ".join(existing_samples),
"%d samples already exist in the template and "
"their values won't be modified" % len(existing_samples),
QiitaDBWarning)

if new_samples:
Expand Down