search for: ini_reader

--- builder/index-parse.y | 6 ++++-- builder/index-parser-c.c | 3 ++- builder/index-struct.h | 1 + builder/ini_reader.ml | 6 +++--- builder/ini_reader.mli | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/builder/index-parse.y b/builder/index-parse.y index 310870d..7ddef53 100644 --- a/builder/index-parse.y +++ b/builder/index-parse.y @@ -150,12 +150,14 @@ emptylines: void yyerror (YY...

...ch 0 \ --install pkg1 --install pkg2 .. \ --sm-remove --sm-unregister The same operations are doable also using --run-command, but this avoids showing username/passwords/pools on command lines, and in general encapsulate them for better control. Thanks, -- Pino Pino Toscano (6): Move ini_reader from builder to mllib mllib: add a real_uri parameter to Ini_reader.read_ini mllib: add duplicate fields check to Ini_reader.read_ini mllib: add duplicate sections check to Ini_reader.read_ini mllib: add quick section/key lookup method customize: add basic subscription-manager operations...

Switch the lex/yacc parser into reentrant mode, to ease the handling of parsing-specific data; introduce a new parser_context struct for that, which is added as extra data to the parser. This should cause no behaviour changes in the parsing, just no more global variables used for getting data in/out the parser. --- builder/index-parse.y | 44 ++++++++++++++++++++++++++++++++++++------

...IRT_CFLAGS) \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + -Wno-unused-macros BOBJECTS = \ $(top_builddir)/mllib/config.cmo \ @@ -93,6 +98,7 @@ BOBJECTS = \ $(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/regedit.cmo \ $(top_builddir)/mllib/uRI.cmo \ + $(top_builddir)/mllib/ini_reader.cmo \ $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index d9547a0..9fb2b14 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -153,6 +153,33 @@ exec >>%s 2>&1 Hashtbl.repla...

...tions(+), 34 deletions(-) create mode 100644 builder/languages.ml create mode 100644 builder/languages.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 387913c..110b146 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -49,6 +49,8 @@ SOURCES = \ index-parser-c.c \ ini_reader.mli \ ini_reader.ml \ + languages.mli \ + languages.ml \ list_entries.mli \ list_entries.ml \ paths.ml \ @@ -101,6 +103,7 @@ deps = \ setlocale.cmx \ ini_reader.cmx \ paths.cmx \ + languages.cmx \ get_kernel.cmx \ downloader.cmx \ sigchecker.cmx \ diff --git a/builder/languages....

.../builder/Makefile.am b/builder/Makefile.am index 2413217..28afeee 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -39,6 +39,7 @@ CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-builder SOURCES_MLI = \ cache.mli \ downloader.mli \ + checksums.mli \ index_parser.mli \ ini_reader.mli \ languages.mli \ @@ -52,6 +53,7 @@ SOURCES_ML = \ utils.ml \ pxzcat.ml \ setlocale.ml \ + checksums.ml \ ini_reader.ml \ paths.ml \ languages.ml \ diff --git a/builder/builder.ml b/builder/builder.ml index d40ad8f..e4f40ef 100644 --- a/builder/builder.ml +++ b/builder/builder.ml...

...644 mllib/checksums.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 7983223..5977d8b 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -44,7 +44,6 @@ SOURCES_MLI = \ cache.mli \ cmdline.mli \ downloader.mli \ - checksums.mli \ index.mli \ index_parser.mli \ ini_reader.mli \ @@ -61,7 +60,6 @@ SOURCES_ML = \ utils.ml \ pxzcat.ml \ setlocale.ml \ - checksums.ml \ index.ml \ ini_reader.ml \ yajl.ml \ diff --git a/builder/builder.ml b/builder/builder.ml index fdbe659..799208a 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -307,7 +307,11 @@ le...

Hi, this small series moves the OCaml Checksums module from virt-builder to mllib, adding more features to use it also for v2v. Thanks, Pino Toscano (4): mllib: move Checksums from builder mllib, builder: add and use Checksums.of_string mllib: add SHA1 support in Checksums v2v: -i ova: use Checksums builder/Makefile.am | 2 -- builder/builder.ml | 6 +++-

...1 file changed, 1 insertion(+) diff --git a/po/POTFILES-ml b/po/POTFILES-ml index ad52110..7933c8e 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -3,6 +3,7 @@ builder/cache.ml builder/checksums.ml builder/cmdline.ml builder/downloader.ml +builder/index.ml builder/index_parser.ml builder/ini_reader.ml builder/languages.ml -- 2.1.0

...ons(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 4a2f639c3..88392d327 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -61,12 +61,12 @@ SOURCES_MLI = \ yajl.mli SOURCES_ML = \ + yajl.ml \ utils.ml \ pxzcat.ml \ setlocale.ml \ index.ml \ ini_reader.ml \ - yajl.ml \ paths.ml \ languages.ml \ cache.ml \ diff --git a/builder/utils.ml b/builder/utils.ml index acb6c2f4b..9fceee282 100644 --- a/builder/utils.ml +++ b/builder/utils.ml @@ -33,3 +33,9 @@ and revision = let string_of_revision = function | Rev_int n -> string_of_int n |...

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - a bit more testing: listing and creating images works, so the current metadata is correct - handle revisions, so newer

...ysprep/dummy.c test-tool/test-tool.c diff --git a/po/POTFILES-ml b/po/POTFILES-ml index 96de6837b..a9b6efdaa 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -4,7 +4,6 @@ builder/cmdline.ml builder/downloader.ml builder/index.ml builder/index_parser.ml -builder/index_parser_tests.ml builder/ini_reader.ml builder/languages.ml builder/list_entries.ml @@ -23,37 +22,27 @@ common/mlcustomize/customize_cmdline.ml common/mlcustomize/firstboot.ml common/mlgettext/common_gettext.ml common/mlpcre/PCRE.ml -common/mlpcre/pcre_tests.ml common/mlprogress/progress.ml common/mlstdutils/guestfs_config.ml...

...l create mode 100644 builder/index.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 28afeee..597b943 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -40,6 +40,7 @@ SOURCES_MLI = \ cache.mli \ downloader.mli \ checksums.mli \ + index.mli \ index_parser.mli \ ini_reader.mli \ languages.mli \ @@ -54,6 +55,7 @@ SOURCES_ML = \ pxzcat.ml \ setlocale.ml \ checksums.ml \ + index.ml \ ini_reader.ml \ paths.ml \ languages.ml \ diff --git a/builder/builder.ml b/builder/builder.ml index 6f2b4bd..a30dbd1 100644 --- a/builder/builder.ml +++ b/builder/builder.ml...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

...builder/Makefile.am b/builder/Makefile.am index 28b2adf..d69e25f 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -39,7 +39,6 @@ CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-builder SOURCES_MLI = \ cache.mli \ downloader.mli \ - get_kernel.mli \ index_parser.mli \ ini_reader.mli \ languages.mli \ @@ -56,7 +55,6 @@ SOURCES_ML = \ ini_reader.ml \ paths.ml \ languages.ml \ - get_kernel.ml \ cache.ml \ sources.ml \ downloader.ml \ diff --git a/builder/builder.ml b/builder/builder.ml index 5ea69c0..1f618ad 100644 --- a/builder/builder.ml +++ b/builder/builder....

...s_BOBJECTS:.cmo=.cmx) +index_parser_tests_SOURCES = \ + index-scan.c \ + index-struct.c \ + index-parser-c.c \ + index-parse.c +index_parser_tests_CPPFLAGS = $(virt_builder_CPPFLAGS) +index_parser_tests_BOBJECTS = \ + utils.cmo \ + cache.cmo \ + downloader.cmo \ + sigchecker.cmo \ + index.cmo \ + ini_reader.cmo \ + index_parser.cmo \ + index_parser_tests.cmo +index_parser_tests_XOBJECTS = $(index_parser_tests_BOBJECTS:.cmo=.cmx) + # Can't call the following as <test>_OBJECTS because automake gets confused. if HAVE_OCAMLOPT yajl_tests_THEOBJECTS = $(yajl_tests_XOBJECTS) yajl_tests.cmx: OC...

...st-virt-index-validate-good-3 \ virt-builder.pod \ + virt-builder-repository.pod \ virt-index-validate.pod \ yajl_tests.ml @@ -85,13 +88,44 @@ SOURCES_C = \ setlocale-c.c \ yajl-c.c +REPOSITORY_SOURCES_ML = \ + utils.ml \ + index.ml \ + cache.ml \ + downloader.ml \ + sigchecker.ml \ + ini_reader.ml \ + index_parser.ml \ + yajl.ml \ + paths.ml \ + sources.ml \ + builder_repository.ml + +REPOSITORY_SOURCES_MLI = \ + cache.mli \ + downloader.mli \ + index.mli \ + index_parser.mli \ + ini_reader.mli \ + sigchecker.mli \ + sources.mli \ + yajl.mli + +REPOSITORY_SOURCES_C = \ + index-scan.c \ +...

...s_BOBJECTS:.cmo=.cmx) +index_parser_tests_SOURCES = \ + index-scan.c \ + index-struct.c \ + index-parser-c.c \ + index-parse.c +index_parser_tests_CPPFLAGS = $(virt_builder_CPPFLAGS) +index_parser_tests_BOBJECTS = \ + utils.cmo \ + cache.cmo \ + downloader.cmo \ + sigchecker.cmo \ + index.cmo \ + ini_reader.cmo \ + index_parser.cmo \ + index_parser_tests.cmo +index_parser_tests_XOBJECTS = $(index_parser_tests_BOBJECTS:.cmo=.cmx) + # Can't call the following as <test>_OBJECTS because automake gets confused. if HAVE_OCAMLOPT yajl_tests_THEOBJECTS = $(yajl_tests_XOBJECTS) yajl_tests.cmx: OC...

...st-virt-index-validate-good-3 \ virt-builder.pod \ + virt-builder-repository.pod \ virt-index-validate.pod \ yajl_tests.ml @@ -85,13 +88,44 @@ SOURCES_C = \ setlocale-c.c \ yajl-c.c +REPOSITORY_SOURCES_ML = \ + utils.ml \ + index.ml \ + cache.ml \ + downloader.ml \ + sigchecker.ml \ + ini_reader.ml \ + index_parser.ml \ + yajl.ml \ + paths.ml \ + sources.ml \ + repository_main.ml + +REPOSITORY_SOURCES_MLI = \ + cache.mli \ + downloader.mli \ + index.mli \ + index_parser.mli \ + ini_reader.mli \ + sigchecker.mli \ + sources.mli \ + yajl.mli + +REPOSITORY_SOURCES_C = \ + index-scan.c \ + ind...