summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/dump.c4
-rw-r--r--tools/dumpdb.c4
-rw-r--r--tools/rpminject.c22
-rw-r--r--tools/rpmsort.c14
4 files changed, 22 insertions, 22 deletions
diff --git a/tools/dump.c b/tools/dump.c
index 0f3ecde6e..58777558b 100644
--- a/tools/dump.c
+++ b/tools/dump.c
@@ -17,14 +17,14 @@ int main(int argc, char *argv[])
}
if (Ferror(fdi)) {
- fprintf(stderr, _("cannot open %s: %s\n"),
+ fprintf(stderr, "cannot open %s: %s\n",
(argc == 1 ? "<stdin>" : argv[1]), Fstrerror(fdi));
exit(EXIT_FAILURE);
}
h = headerRead(fdi, HEADER_MAGIC_YES);
if (!h) {
- fprintf(stderr, _("headerRead error: %s\n"), Fstrerror(fdi));
+ fprintf(stderr, "headerRead error: %s\n", Fstrerror(fdi));
exit(EXIT_FAILURE);
}
Fclose(fdi);
diff --git a/tools/dumpdb.c b/tools/dumpdb.c
index d6151f267..04d55c920 100644
--- a/tools/dumpdb.c
+++ b/tools/dumpdb.c
@@ -20,12 +20,12 @@ int main(int argc, char *argv[])
if (argc == 2) {
dspBlockNum = atoi(argv[1]);
} else if (argc != 1) {
- fprintf(stderr, _("dumpdb <block num>\n"));
+ fprintf(stderr, "dumpdb <block num>\n");
exit(1);
}
if (rpmdbOpen("", &db, O_RDONLY, 0644)) {
- fprintf(stderr, _("cannot open Packages\n"));
+ fprintf(stderr, "cannot open Packages\n");
exit(1);
}
diff --git a/tools/rpminject.c b/tools/rpminject.c
index 03f3011da..a3b7b0fb9 100644
--- a/tools/rpminject.c
+++ b/tools/rpminject.c
@@ -314,19 +314,19 @@ headerInject(Header *hdrp, cmd_t *cmds[], int ncmds)
switch(c->injmode) {
case INJ_ADD:
if (!(rc && c->done > 0)) {
- warnx(_("failed to add tag %s"), rpmTagGetName(c->tagval));
+ warnx("failed to add tag %s", rpmTagGetName(c->tagval));
ec = 1;
}
break;
case INJ_DELETE:
if (!(!rc && c->done > 0)) {
- warnx(_("failed to delete tag %s"), rpmTagGetName(c->tagval));
+ warnx("failed to delete tag %s", rpmTagGetName(c->tagval));
ec = 1;
}
break;
case INJ_MODIFY:
if (!(rc && c->done > 0)) {
- warnx(_("failed to modify tag %s"), rpmTagGetName(c->tagval));
+ warnx("failed to modify tag %s", rpmTagGetName(c->tagval));
ec = 1;
}
break;
@@ -424,14 +424,14 @@ do_inject(cmd_t *cmds[], int ncmds, const char *argv[])
strcat(fni, "-SAVE");
unlink(fni);
if (link(fno, fni)) {
- warn(_("can't link temp input file %s"), fni);
+ warn("can't link temp input file %s", fni);
ec++;
continue;
}
if (rewriteRPM(fni, fno, cmds, ncmds)) {
unlink(fno);
if (rename(fni, fno))
- warn(_("can't rename %s to %s"), fni, fno);
+ warn("can't rename %s to %s", fni, fno);
ec++;
}
if (fni) free(fni);
@@ -491,25 +491,25 @@ main(int argc, char *argv[])
break;
case 't':
if (ncmds == 0 || c == NULL)
- errx(EXIT_FAILURE, _("missing inject mode before \"--tag %s\""), optArg);
+ errx(EXIT_FAILURE, "missing inject mode before \"--tag %s\"", optArg);
if (c->tag) {
if (c->injmode != INJ_DELETE &&
(c->nvals <= 0 || c->vals == NULL))
- errx(EXIT_FAILURE, _("add/modify inject mode with \"--tag %s\" needs a value"), c->tag);
+ errx(EXIT_FAILURE, "add/modify inject mode with \"--tag %s\" needs a value", c->tag);
cmds[ncmds] = c = xcalloc(1, sizeof(cmd_t));
cmds[ncmds]->injmode = cmds[ncmds-1]->injmode;
ncmds++;
}
c->tagval = rpmTagGetValue(optArg);
if (c->tagval == RPMTAG_NOT_FOUND)
- errx(EXIT_FAILURE, _("unknown rpm tag \"--tag %s\""), optArg);
+ errx(EXIT_FAILURE, "unknown rpm tag \"--tag %s\"", optArg);
c->tag = xstrdup(optArg);
break;
case 'v':
if (ncmds == 0 || c == NULL)
- errx(EXIT_FAILURE, _("missing inject mode before \"--value %s\""), optArg);
+ errx(EXIT_FAILURE, "missing inject mode before \"--value %s\"", optArg);
if (c->tag == NULL)
- errx(EXIT_FAILURE, _("missing tag name before \"--value %s\""), optArg);
+ errx(EXIT_FAILURE, "missing tag name before \"--value %s\"", optArg);
if (c->nvals == 0 || c->vals == NULL) {
c->vals = xcalloc(2, sizeof(char *));
} else {
@@ -524,7 +524,7 @@ main(int argc, char *argv[])
exit(EXIT_SUCCESS);
break;
default:
- errx(EXIT_FAILURE, _("unknown popt return (%d)"), arg);
+ errx(EXIT_FAILURE, "unknown popt return (%d)", arg);
break;
}
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index fc9bf5141..bb03e499a 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -66,7 +66,7 @@ do_tsort(const char *fileArgv[], int noDeps)
rc = rpmtsOpenDB(ts, O_RDONLY);
if (rc) {
- rpmlog(RPMLOG_ERR, _("cannot open Packages database\n"));
+ rpmlog(RPMLOG_ERR, "cannot open Packages database\n");
rc = -1;
goto exit;
}
@@ -126,7 +126,7 @@ restart:
/* Try to read the header from a package file. */
fd = Fopen(*fnp, "r.ufdio");
if (fd == NULL || Ferror(fd)) {
- rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), *fnp,
+ rpmlog(RPMLOG_ERR, "open of %s failed: %s\n", *fnp,
Fstrerror(fd));
if (fd) Fclose(fd);
numFailed++; *fnp = NULL;
@@ -143,7 +143,7 @@ restart:
}
if (rc != RPMRC_NOTFOUND) {
- rpmlog(RPMLOG_ERR, _("%s cannot be installed\n"), *fnp);
+ rpmlog(RPMLOG_ERR, "%s cannot be installed\n", *fnp);
numFailed++; *fnp = NULL;
break;
}
@@ -151,7 +151,7 @@ restart:
/* Try to read a package manifest. */
fd = Fopen(*fnp, "r.fpio");
if (fd == NULL || Ferror(fd)) {
- rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), *fnp,
+ rpmlog(RPMLOG_ERR, "open of %s failed: %s\n", *fnp,
Fstrerror(fd));
if (fd) Fclose(fd);
numFailed++; *fnp = NULL;
@@ -161,7 +161,7 @@ restart:
/* Read list of packages from manifest. */
rc = rpmReadPackageManifest(fd, &argc, &argv);
if (rc)
- rpmlog(RPMLOG_NOTICE, _("%s: read manifest failed: %s\n"),
+ rpmlog(RPMLOG_NOTICE, "%s: read manifest failed: %s\n",
fileURL, Fstrerror(fd));
Fclose(fd);
@@ -184,7 +184,7 @@ restart:
ps = rpmtsProblems(ts);
if (ps) {
- rpmlog(RPMLOG_ERR, _("Failed dependencies:\n"));
+ rpmlog(RPMLOG_ERR, "Failed dependencies:\n");
rpmpsPrint(NULL, ps);
ps = rpmpsFree(ps);
rc = -1;
@@ -276,7 +276,7 @@ main(int argc, char *argv[])
rpmIncreaseVerbosity();
break;
default:
- fprintf(stderr, _("unknown popt return (%d)"), arg);
+ fprintf(stderr, "unknown popt return (%d)", arg);
exit(EXIT_FAILURE);
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:24:42 +0000