Fixed #6419 -- Fixed verbosity level checks in loaddata command that were raised to unobtainable levels in [6883].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
3fd5b5d6a8
commit
ff707f502c
|
@ -59,7 +59,7 @@ class Command(BaseCommand):
|
||||||
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:
|
||||||
|
@ -109,7 +109,7 @@ class Command(BaseCommand):
|
||||||
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))
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ class Command(BaseCommand):
|
||||||
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:
|
||||||
|
|
Loading…
Reference in New Issue