Skip to content

Commit

Permalink
Fixed #6419 -- Fixed verbosity level checks in loaddata command that …
Browse files Browse the repository at this point in the history
…were raised to unobtainable levels in [6883].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
gdub committed Jan 28, 2008
1 parent 3fd5b5d commit ff707f5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions django/core/management/commands/loaddata.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def handle(self, *fixture_labels, **options):
else: else:
formats = [] formats = []


if verbosity > 2: if verbosity >= 2:
if formats: if formats:
print "Loading '%s' fixtures..." % fixture_name print "Loading '%s' fixtures..." % fixture_name
else: else:
Expand Down Expand Up @@ -109,7 +109,7 @@ def handle(self, *fixture_labels, **options):
return return
fixture.close() fixture.close()
except: except:
if verbosity > 2: if verbosity >= 2:
print "No %s fixture '%s' in %s." % \ print "No %s fixture '%s' in %s." % \
(format, fixture_name, humanize(fixture_dir)) (format, fixture_name, humanize(fixture_dir))


Expand All @@ -125,7 +125,7 @@ def handle(self, *fixture_labels, **options):
transaction.leave_transaction_management() transaction.leave_transaction_management()


if count[0] == 0: if count[0] == 0:
if verbosity > 2: if verbosity >= 2:
print "No fixtures found." print "No fixtures found."
else: else:
if verbosity > 0: if verbosity > 0:
Expand Down

0 comments on commit ff707f5

Please sign in to comment.