[bug-sourceinstall] [patch #6315] patch for sourceinstall/sourceinstall.c

[Jorma Karvonen]

URL:
  <http://savannah.gnu.org/patch/?6315>

                 Summary: patch for sourceinstall/sourceinstall.c
                 Project: GNU Source Installer
            Submitted by: jormak
            Submitted on: Thursday 12/06/2007 at 22:37
                Category: None
                Priority: 5 - Normal
                  Status: None
                 Privacy: Public
             Assigned to: None
        Originator Email: 
             Open/Closed: Open
         Discussion Lock: Any

    _______________________________________________________

Details:

22a23,25
> #ifdef HAVE_NLS
> # include <locale.h>
> #endif
64c67
<       srcinst_warning(SRCINST_ERR_BUSY, "package already exists",
---
>       srcinst_warning(SRCINST_ERR_BUSY, gettext("package already exists"),
110c113
<       srcinst_warning(SRCINST_ERR_INVALID, "must specify a PACKAGE_NAME",
---
>       srcinst_warning(SRCINST_ERR_INVALID, gettext("must specify a
PACKAGE_NAME"),
116c119
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
121c124
<     printf("package name: %s\n", packagename);
---
>     printf(gettext("package name: %s\n"), packagename);
124c127
<       printf("package description: %s\n\n", tmp);
---
>       printf(gettext("package description: %s\n\n"), tmp);
131c134
<       printf("configured as: %s\n", tmp);
---
>       printf(gettext("configured as: %s\n"), tmp);
134,135c137,138
<     printf("source available: %s\n",
<          srcinst_is_source_available(h) ? "yes" : "no");
---
>     printf(gettext("source available: %s\n"),
>          srcinst_is_source_available(h) ? gettext("yes") : gettext("no"));
139c142
<       printf("source location: %s\n", tmp);
---
>       printf(gettext("source location: %s\n"), tmp);
145c148
<           printf("compressed source size (KB): %s\n", offstr);
---
>           printf(gettext("compressed source size (KB): %s\n"), offstr);
150c153
<           printf("build subdirectory: %s\n", tmp);
---
>           printf(gettext("build subdirectory: %s\n"), tmp);
154c157
<     printf("installed: %s\n", srcinst_is_installed(h) ? "yes" : "no");
---
>     printf(gettext("installed: %s\n"), srcinst_is_installed(h) ?
gettext("yes") : gettext("no"));
162c165
<           printf("installed size (KB): %s\n", offstr);
---
>           printf(gettext("installed size (KB): %s\n"), offstr);
167c170
<           printf("installation prefix: %s\n", tmp);
---
>           printf(gettext("installation prefix: %s\n"), tmp);
190c193
<               printf("installed files: all present and reachable.\n");
---
>               printf(gettext("installed files: all present and 
> reachable.\n"));
194c197
<               ("installed files: no files installed, or no info 
available.\n");
---
>               (gettext("installed files: no files installed, or no info
available.\n"));
209c212
<       srcinst_warning(err, "could not initialize build", 0);
---
>       srcinst_warning(err, gettext("could not initialize build"), 0);
216c219
<           srcinst_warning(err, "configuration failed", 0);
---
>           srcinst_warning(err, gettext("configuration failed"), 0);
224c227
<                       "failed to detect makefile features", 0);
---
>                       gettext("failed to detect makefile features"), 0);
235c238
<                           "build system does not support staged installs",
---
>                           gettext("build system does not support staged 
> installs"),
241,242c244,245
<                           "build system does not support staged installs, "
<                           "forcing prefix redirection", 0);
---
>                           gettext("build system does not support staged 
> installs, "
>                           "forcing prefix redirection"), 0);
245,246c248,249
<                           "build system does not support staged installs. Use 
"
<                           "--force to use prefix redirection (discouraged)",
---
>                           gettext("build system does not support staged 
> installs. Use "
>                           "--force to use prefix redirection (discouraged)"),
255c258
<           srcinst_warning(err, "source installation failed", 0);
---
>           srcinst_warning(err, gettext("source installation failed"), 0);
261c264
<       srcinst_warning(err, "compilation phase failed", 0);
---
>       srcinst_warning(err, gettext("compilation phase failed"), 0);
268c271
<           srcinst_warning(err, "test installation failed", 0);
---
>           srcinst_warning(err, gettext("test installation failed"), 0);
277c280
<                               "conflict test could not be performed", 0);
---
>                               gettext("conflict test could not be 
> performed"), 0);
284,285c287,288
<                               "installation would overwrite "
<                               "files claimed by other packages:", 0);
---
>                               gettext("installation would overwrite "
>                               "files claimed by other packages:"), 0);
299c302
<           srcinst_warning(err, "binary installation failed", 0);
---
>           srcinst_warning(err, gettext("binary installation failed"), 0);
325c328
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
337c340
<                       "source code not available for", packagename);
---
>                       gettext("source code not available for"), packagename);
358c361
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
364c367
<       srcinst_warning(SRCINST_ERR_INVALID, "not an installed package",
---
>       srcinst_warning(SRCINST_ERR_INVALID, gettext("not an installed 
> package"),
371c374
<       srcinst_warning(err, "binary uninstallation failed", 0);
---
>       srcinst_warning(err, gettext("binary uninstallation failed"), 0);
389c392
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
395c398
<       srcinst_warning(SRCINST_ERR_MISSING, "source code not available",
---
>       srcinst_warning(SRCINST_ERR_MISSING, gettext("source code not
available"),
402c405
<       srcinst_warning(err, "source uninstallation failed", 0);
---
>       srcinst_warning(err, gettext("source uninstallation failed"), 0);
417,418c420,421
<       srcinst_warning(SRCINST_ERR_ACTION, "cannot start upgrade, "
<                       "check package names", 0);
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("cannot start upgrade, "
>                       "check package names"), 0);
424c427
<                       "could not install new package version", 0);
---
>                       gettext("could not install new package version"), 0);
446c449
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
455c458
<           srcinst_warning(err, "binary uninstallation failed", 0);
---
>           srcinst_warning(err, gettext("binary uninstallation failed"), 0);
464c467
<           srcinst_warning(err, "source uninstallation failed", 0);
---
>           srcinst_warning(err, gettext("source uninstallation failed"), 0);
472c475
< int export(char *packagename, char *export_format, char *filename)
---
> int export_src(char *packagename, char *export_format, char *filename)
481c484
<       srcinst_warning(SRCINST_ERR_INVALID, "export format",
---
>       srcinst_warning(SRCINST_ERR_INVALID, gettext("export format"),
494c497
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
503c506
<                       "no installed files information available for",
---
>                       gettext("no installed files information available for"),
509c512
<       srcinst_warning(err, "failed to export package information", 0);
---
>       srcinst_warning(err, gettext("failed to export package information"), 
> 0);
529c532
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
536c539
<       srcinst_warning(err, "failed to export binary package",
---
>       srcinst_warning(err, gettext("failed to export binary package"),
550c553
<       srcinst_warning(SRCINST_ERR_INVALID, "ignoring package name",
---
>       srcinst_warning(SRCINST_ERR_INVALID, gettext("ignoring package name"),
556c559
<                       "could not create temp package", 0);
---
>                       gettext("could not create temp package"), 0);
562c565
<                       "ignoring -D, --subdir option", 0);
---
>                       gettext("ignoring -D, --subdir option"), 0);
567c570
<       srcinst_warning(err, "could not scan temporary build", 0);
---
>       srcinst_warning(err, gettext("could not scan temporary build"), 0);
592c595
<                   printf("[custom]\n");
---
>                   printf(gettext("[custom]\n"));
596c599
<               printf("[unknown]\n");
---
>               printf(gettext("[unknown]\n"));
615c618
<       srcinst_warning(SRCINST_ERR_INVALID, "ignoring package name",
---
>       srcinst_warning(SRCINST_ERR_INVALID, gettext("ignoring package name"),
621c624
<                       "could not create temp package", 0);
---
>                       gettext("could not create temp package"), 0);
626c629
<       srcinst_warning(err, "could not initialize temporary build", 0);
---
>       srcinst_warning(err, gettext("could not initialize temporary build"), 
> 0);
644c647
<       printf("no\n");
---
>       printf(gettext("no\n"));
647c650
<           printf("custom\n");
---
>           printf(gettext("custom\n"));
651,652c654,655
<       printf("configure test: %s",
<              configure_test ? "success" : "failure");
---
>       printf(gettext("configure test: %s"),
>              configure_test ? gettext("success") : gettext("failure"));
655c658
<     printf("\nmakefile: %s\n", mf ? "yes" : "no");
---
>     printf("\nmakefile: %s\n", mf ? gettext("yes") : gettext("no"));
664c667
<              "yes" : "no");
---
>              gettext("yes") : gettext("no"));
668c671
<              "yes" : "no");
---
>              gettext("yes") : gettext("no"));
671,672c674,675
<                                           SRCINST_FEATURE_STRIP) ? "yes"
<              : "no");
---
>                                           SRCINST_FEATURE_STRIP) ? 
> gettext("yes")
>              : gettext("no"));
690c693
<       srcinst_warning(SRCINST_ERR_INVALID, "ignoring package name",
---
>       srcinst_warning(SRCINST_ERR_INVALID, gettext("ignoring package name"),
696c699
<                       "could not create temp package", 0);
---
>                       gettext("could not create temp package"), 0);
701c704
<       srcinst_warning(err, "could not initialize temporary build", 0);
---
>       srcinst_warning(err, gettext("could not initialize temporary build"), 
> 0);
711c714
<       srcinst_warning(err, "could not detect configure options", 0);
---
>       srcinst_warning(err, gettext("could not detect configure options"), 0);
715c718
<           printf("Option class: Optional Packages\n");
---
>           printf(gettext("Option class: Optional Packages\n"));
719c722
<           printf("Option class: Optional Features\n");
---
>           printf(gettext("Option class: Optional Features\n"));
723c726
<           printf("Option class: Influential Environment Variables\n");
---
>           printf(gettext("Option class: Influential Environment 
> Variables\n"));
727c730
<           printf("Option class: Old-style (2.13) features/packages\n");
---
>           printf(gettext("Option class: Old-style (2.13)
features/packages\n"));
731c734
<           printf("Option class: uncategorized\n");
---
>           printf(gettext("Option class: uncategorized\n"));
753c756
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
783c786
<       srcinst_warning(SRCINST_ERR_MISSING, "must specify a PACKAGE_NAME",
---
>       srcinst_warning(SRCINST_ERR_MISSING, gettext("must specify a
PACKAGE_NAME"),
789c792
<       srcinst_warning(SRCINST_ERR_ACTION, "could not open package",
---
>       srcinst_warning(SRCINST_ERR_ACTION, gettext("could not open package"),
818c821
<                             "package name already specified", argv[i]);
---
>                             gettext("package name already specified"), 
> argv[i]);
838c841
<                                         "multiple actions requested",
---
>                                         gettext("multiple actions requested"),
855c858
<                                                 "required option parameter",
---
>                                                 gettext("required option 
> parameter"),
865c868
<                                     "unique option already defined",
---
>                                     gettext("unique option already defined"),
872c875
<                                             "required string for",
---
>                                             gettext("required string for"),
892c895
<       srcinst_error(SRCINST_ERR_INVALID, "unrecognized option:",
---
>       srcinst_error(SRCINST_ERR_INVALID, gettext("unrecognized option:"),
930c933
<     printf("GNU Source Installer version %s usage:\n\n", PACKAGE_VERSION);
---
>     printf(gettext("GNU Source Installer version %s usage:\n\n"),
PACKAGE_VERSION);
932c935
<       ("%s ACTION [PARAM...] [OPTION [PARAM...]]... [PACKAGE_NAME]\n\n",
---
>       (gettext("%s ACTION [PARAM...] [OPTION [PARAM...]]...
[PACKAGE_NAME]\n\n"),
934c937
<     printf("%s [OPTION [PARAM...]] FILENAME\n", program_name);
---
>     printf(gettext("%s [OPTION [PARAM...]] FILENAME\n"), program_name);
936c939
<       ("    if no action is specified, add FILENAME using defaults.\n");
---
>       (gettext("    if no action is specified, add FILENAME using
defaults.\n"));
942c945
<     printf("\nACTIONS:\n");
---
>     printf(gettext("\nACTIONS:\n"));
944c947
<     printf("\nOTHER OPTIONS:\n");
---
>     printf(gettext("\nOTHER OPTIONS:\n"));
946c949
<     printf("\nSend bug reports to " PACKAGE_BUGREPORT " .\n");
---
>     printf(gettext("\nSend bug reports to " PACKAGE_BUGREPORT " .\n"));
1001,1004c1004,1007
<     printf("GNU Source Installer version %s\n", PACKAGE_VERSION);
<     printf("Copyright (c) 2005,2006,2007 Claudio Fontana\n");
<     printf("This is Free Software that comes with NO WARRANTY;\n");
<     printf("(see file COPYING for more details)\n");
---
>     printf(gettext("GNU Source Installer version %s\n"), PACKAGE_VERSION);
>     printf(gettext("Copyright (c) 2005,2006,2007 Claudio Fontana\n"));
>     printf(gettext("This is Free Software that comes with NO
WARRANTY;\n"));
>     printf(gettext("(see file COPYING for more details)\n"));
1028c1031
<                                 "compression format", data->values[0]);
---
>                                 gettext("compression format"), 
> data->values[0]);
1096c1099
<       return export(o.package, "xml", data->values[0]);
---
>       return export_src(o.package, "xml", data->values[0]);
1099c1102
<       return export(o.package, "txt", data->values[0]);
---
>       return export_src(o.package, "txt", data->values[0]);
1102c1105
<       return export(o.package, "lst", data->values[0]);
---
>       return export_src(o.package, "lst", data->values[0]);
1124c1127
<       srcinst_error(SRCINST_ERR_CORE, "could not initialize libsrcinst",
---
>       srcinst_error(SRCINST_ERR_CORE, gettext("could not initialize
libsrcinst"),
1128c1131
<     program_name = (argv[0] ? srcinst_basename(argv[0]) :
"sourceinstall");
---
>     program_name = (argv[0] ? srcinst_basename(argv[0]) :
gettext("sourceinstall"));
1134c1137
<                     "nothing to do. Try -h or --help", 0);
---
>                     gettext("nothing to do. Try -h or --help"), 0);
1138c1141
<       srcinst_error(SRCINST_ERR_ACTION, "failure", 0);
---
>       srcinst_error(SRCINST_ERR_ACTION, gettext("failure"), 0);
1148c1151
<       printf("Option: %s", set->options[i].key);
---
>       printf(gettext("Option: %s"), set->options[i].key);
1154c1157
<           printf("Comment: %s", set->options[i].comment);
---
>           printf(gettext("Comment: %s"), set->options[i].comment);





    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/patch/?6315>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/