diff options
| author | Jan Kara <jack@suse.cz> | 2013-02-04 23:21:30 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-02-04 23:21:30 +0100 |
| commit | 8985a04067eb396877593db102d4a535c8a2871a (patch) | |
| tree | 7f876abcc0d5849e3c0fcbe1b9bcb1d6179604f1 | |
| parent | 5f7b9d139d64117abc4dcd66d2fbac99c070d7ce (diff) | |
| download | quota-tools-8985a04067eb396877593db102d4a535c8a2871a.tar.gz | |
quotacheck: Make sure -d provides at least as much information as -v
There was a couple of useful messages that were printed when -v was
specified but not when -d was specified. Fix this.
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | quotacheck.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/quotacheck.c b/quotacheck.c index e047825..e62c3a7 100644 --- a/quotacheck.c +++ b/quotacheck.c @@ -880,12 +880,12 @@ static int sub_quota_file(struct mount_entry *mnt, int qtype, int ftype) debug(FL_DEBUG, _("Substracting space used by old %s quota file.\n"), _(type2name(ftype))); if (get_qf_name(mnt, ftype, cfmt, 0, &filename) < 0) { - debug(FL_VERBOSE, _("Old %s file name could not been determined. Usage will not be subtracted.\n"), _(type2name(ftype))); + debug(FL_VERBOSE | FL_DEBUG, _("Old %s file name could not been determined. Usage will not be subtracted.\n"), _(type2name(ftype))); return 0; } if (stat(filename, &st) < 0) { - debug(FL_VERBOSE, _("Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n"), _(type2name(ftype)), filename, strerror(errno)); + debug(FL_VERBOSE | FL_DEBUG, _("Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n"), _(type2name(ftype)), filename, strerror(errno)); free(filename); return 0; } @@ -961,7 +961,7 @@ Please stop all programs writing to filesystem or use -m flag to force checking. debug(FL_DEBUG, _("Filesystem remounted read-only\n")); } start_scan: - debug(FL_VERBOSE, _("Scanning %s [%s] "), mnt->me_devname, mnt->me_dir); + debug(FL_VERBOSE | FL_DEBUG, _("Scanning %s [%s] "), mnt->me_devname, mnt->me_dir); #if defined(EXT2_DIRECT) if (!strcmp(mnt->me_type, MNTTYPE_EXT2) || !strcmp(mnt->me_type, MNTTYPE_EXT3) || !strcmp(mnt->me_type, MNTTYPE_NEXT3)) { if ((failed = ext2_direct_scan(mnt->me_devname)) < 0) @@ -977,7 +977,7 @@ start_scan: goto out; } dirs_done++; - if (flags & FL_VERBOSE || flags & FL_VERYVERBOSE) + if (flags & FL_VERBOSE || flags & FL_DEBUG) fputs(_("done\n"), stdout); if (ucheck) { failed |= sub_quota_file(mnt, USRQUOTA, USRQUOTA); @@ -1171,7 +1171,7 @@ static int check_all(void) debug(FL_DEBUG, _("Detected quota format %s\n"), fmt2name(cfmt)); } - if (flags & FL_VERBOSE && + if (flags & (FL_VERBOSE | FL_DEBUG) && !str_hasmntopt(mnt->me_opts, MNTOPT_USRJQUOTA) && !str_hasmntopt(mnt->me_opts, MNTOPT_GRPJQUOTA) && !warned && |