Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at 2012-12-05 14:10:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old) and /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-product-creator", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes 2012-11-02 17:45:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes 2012-12-05 14:10:52.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Dec 3 16:06:32 CET 2012 - [email protected] + +- read-only support for repository aliases (fate#312133) + (alias can be found in config.xml and defined in system + /etc/kiwi/repoalias file) +- 2.23.1 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.23.0.tar.bz2 New: ---- yast2-product-creator-2.23.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.PAvox9/_old 2012-12-05 14:10:53.000000000 +0100 +++ /var/tmp/diff_new_pack.PAvox9/_new 2012-12-05 14:10:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-product-creator -Version: 2.23.0 +Version: 2.23.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-product-creator-2.23.0.tar.bz2 -> yast2-product-creator-2.23.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/Makefile.in new/yast2-product-creator-2.23.1/Makefile.in --- old/yast2-product-creator-2.23.0/Makefile.in 2012-10-29 15:33:50.000000000 +0100 +++ new/yast2-product-creator-2.23.1/Makefile.in 2012-12-04 15:57:17.000000000 +0100 @@ -684,7 +684,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/VERSION new/yast2-product-creator-2.23.1/VERSION --- old/yast2-product-creator-2.23.0/VERSION 2012-11-02 12:59:45.000000000 +0100 +++ new/yast2-product-creator-2.23.1/VERSION 2012-12-03 16:09:03.000000000 +0100 @@ -1 +1 @@ -2.23.0 +2.23.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/agents/Makefile.am new/yast2-product-creator-2.23.1/agents/Makefile.am --- old/yast2-product-creator-2.23.0/agents/Makefile.am 2012-10-29 14:52:42.000000000 +0100 +++ new/yast2-product-creator-2.23.1/agents/Makefile.am 2012-12-03 14:12:21.000000000 +0100 @@ -2,8 +2,6 @@ # Makefile.am for devtools/devtools/skeletons/config/agents # -agent_SCRIPTS = +scrconf_DATA = *.scr -scrconf_DATA = cfg_product-creator.scr - -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) +EXTRA_DIST = $(scrconf_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/agents/Makefile.in new/yast2-product-creator-2.23.1/agents/Makefile.in --- old/yast2-product-creator-2.23.0/agents/Makefile.in 2012-10-29 15:33:50.000000000 +0100 +++ new/yast2-product-creator-2.23.1/agents/Makefile.in 2012-12-04 15:57:17.000000000 +0100 @@ -18,7 +18,6 @@ # Makefile.am for devtools/devtools/skeletons/config/agents # - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -65,6 +64,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -92,15 +98,7 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)" -SCRIPTS = $(agent_SCRIPTS) -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac +am__installdirs = "$(DESTDIR)$(scrconfdir)" DATA = $(scrconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -220,9 +218,8 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -agent_SCRIPTS = -scrconf_DATA = cfg_product-creator.scr -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) +scrconf_DATA = *.scr +EXTRA_DIST = $(scrconf_DATA) all: all-am .SUFFIXES: @@ -256,41 +253,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-agentSCRIPTS: $(agent_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(agent_SCRIPTS)'; test -n "$(agentdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(agentdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(agentdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(agentdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(agentdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-agentSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(agent_SCRIPTS)'; test -n "$(agentdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(agentdir)'; $(am__uninstall_files_from_dir) install-scrconfDATA: $(scrconf_DATA) @$(NORMAL_INSTALL) @list='$(scrconf_DATA)'; test -n "$(scrconfdir)" || list=; \ @@ -353,9 +315,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) $(DATA) +all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)"; do \ + for dir in "$(DESTDIR)$(scrconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -408,7 +370,7 @@ info-am: -install-data-am: install-agentSCRIPTS install-scrconfDATA +install-data-am: install-scrconfDATA install-dvi: install-dvi-am @@ -452,21 +414,20 @@ ps-am: -uninstall-am: uninstall-agentSCRIPTS uninstall-scrconfDATA +uninstall-am: uninstall-scrconfDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-agentSCRIPTS install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-scrconfDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \ - uninstall-scrconfDATA + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-scrconfDATA install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-scrconfDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/agents/etc_kiwi_repoalias.scr new/yast2-product-creator-2.23.1/agents/etc_kiwi_repoalias.scr --- old/yast2-product-creator-2.23.0/agents/etc_kiwi_repoalias.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-product-creator-2.23.1/agents/etc_kiwi_repoalias.scr 2012-12-04 15:51:34.000000000 +0100 @@ -0,0 +1,30 @@ +/** + * Summary: SCR Agent for reading /etc/kiwi/repoalias + * + * Example of /etc/kiwi/repoalias file: + +--- cut + +#SLES SP2 repository +{SLES 11 SP2 i386} http://sleposlab.suse.cz/repo/$RCE/SLES11-SP2-Core/ +# SLES SP2 update +{SLES 11 SP2 i386 update}http://sleposlab.suse.cz/repo/$RCE/SLES11-SP2-Updates/ +#openSUSE repository: +{12.2 DVD} iso:///?iso=openSUSE-12.2-DVD-x86_64.iso&url=file:///install/ + +--- cut + */ +.etc.kiwi.repoalias + +`ag_ini( + `IniAgent( + "/etc/kiwi/repoalias", + $[ "options" : [ "global_values" ], + "comments" : [ "^#.*", "^[ \t]*$" ], + "params" : [ + $[ + "match" : [ "^[ \t]*(\\{.*\\})[ \t]*(.*[^ \t])[ \t]*$", + "%s\t%s" ], + ] + ] + ])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/configure new/yast2-product-creator-2.23.1/configure --- old/yast2-product-creator-2.23.0/configure 2012-10-29 15:33:49.000000000 +0100 +++ new/yast2-product-creator-2.23.1/configure 2012-12-04 15:57:16.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-product-creator 2.22.8. +# Generated by GNU Autoconf 2.69 for yast2-product-creator 2.23.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-product-creator' PACKAGE_TARNAME='yast2-product-creator' -PACKAGE_VERSION='2.22.8' -PACKAGE_STRING='yast2-product-creator 2.22.8' +PACKAGE_VERSION='2.23.1' +PACKAGE_STRING='yast2-product-creator 2.23.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-product-creator 2.22.8 to adapt to many kinds of systems. +\`configure' configures yast2-product-creator 2.23.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-product-creator 2.22.8:";; + short | recursive ) echo "Configuration of yast2-product-creator 2.23.1:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-product-creator configure 2.22.8 +yast2-product-creator configure 2.23.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-product-creator $as_me 2.22.8, which was +It was created by yast2-product-creator $as_me 2.23.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-product-creator' - VERSION='2.22.8' + VERSION='2.23.1' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.22.8" +VERSION="2.23.1" RPMNAME="yast2-product-creator" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-product-creator $as_me 2.22.8, which was +This file was extended by yast2-product-creator $as_me 2.23.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-product-creator config.status 2.22.8 +yast2-product-creator config.status 2.23.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/configure.in new/yast2-product-creator-2.23.1/configure.in --- old/yast2-product-creator-2.23.0/configure.in 2012-10-29 15:33:47.000000000 +0100 +++ new/yast2-product-creator-2.23.1/configure.in 2012-12-04 15:57:13.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-product-creator dnl -dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.23.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.22.8, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.23.1, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.8" +VERSION="2.23.1" RPMNAME="yast2-product-creator" MAINTAINER="Jiri Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/src/Kiwi.ycp new/yast2-product-creator-2.23.1/src/Kiwi.ycp --- old/yast2-product-creator-2.23.0/src/Kiwi.ycp 2012-11-01 14:25:54.000000000 +0100 +++ new/yast2-product-creator-2.23.1/src/Kiwi.ycp 2012-12-04 16:00:22.000000000 +0100 @@ -45,6 +45,17 @@ import "String"; import "URL"; + // path to file with global repo aliases (fate#312133) + string aliases_path = "/etc/kiwi/repoalias"; + + // mapping of repository aliases to real URLs + // nil means not activated + map<string,string> alias2url = nil; + + // mapping of repo URLs to alias - only those used in last read + // (so not the reverse of alias2url map) + map<string,string> url2alias = $[]; + /** * argument for any_xml agent: key indicating content of element without * attributes @@ -152,6 +163,13 @@ ret = repo["org"]:$[]; } }); + if (url2alias[source]:"" != "") + { + ret["source",0,"path"] = url2alias[source]:""; + y2milestone ("alias for %1 is %2", source, url2alias[source]:""); + return ret; + } + if (ret != $[]) { y2milestone ("imported source: %1", source); @@ -270,6 +288,40 @@ } /** + * Read global list of repository aliases + */ + global map<string,string> ReadAliases (boolean force) { + if (alias2url != nil && !force) + { + return alias2url; + } + alias2url = $[]; + if (FileUtils::Exists (aliases_path)) + { + list<string> aliases = (list<string>) SCR::Dir (.etc.kiwi.repoalias.v); + if (aliases == nil) + { + y2warning ("aliases file broken, empty or not for reading..."); + } + else + { + foreach (string alias, aliases, { + string url = (string) SCR::Read (add (.etc.kiwi.repoalias.v, alias)); + if (url == nil || url == "") + { + y2warning ("alias '%1' incorrectly defined: '%2'", alias, url); + } + else + { + alias2url[alias] = url; + } + }); + } + } + return alias2url; + } + + /** * import the data from given config.xml * @param directory where to look for config.xml * @ret map of imported data @@ -282,6 +334,7 @@ y2warning ("no such file %1/config.xml", base_path); return ret; } + url2alias = $[]; string file_path = base_path + "/config.xml"; // transformation to latest kiwi version @@ -342,7 +395,23 @@ ret["split"] = image["split"]:[]; if (image["repository"]:nil != nil) - ret["repository"] = image["repository"]:nil; + { + // check repo aliases and replace with real paths for YaST + ReadAliases (false); + list<map> image_repos = image["repository"]:[]; + ret["repository"] = maplist (map repo, image["repository"]:[], { + string source = repo["source",0,"path"]:""; + string url = alias2url[source]:""; + if (url != "") + { + repo["source",0,"path"] = url; + // save alias for writing: + url2alias[url] = source; + y2milestone ("alias %1 replaced with %2", source, url); + } + return repo; + }); + } // FIXME iso-directory should be used only when converting PC->IC if (haskey (ret["preferences",0]:$[], "defaultdestination")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.23.0/src/kiwi_dialogs.ycp new/yast2-product-creator-2.23.1/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.23.0/src/kiwi_dialogs.ycp 2012-11-01 14:29:30.000000000 +0100 +++ new/yast2-product-creator-2.23.1/src/kiwi_dialogs.ycp 2012-12-03 13:14:58.000000000 +0100 @@ -604,9 +604,13 @@ define void InitSize (string id) { map size_map = get_current_size_map (KiwiConfig, kiwi_task); - integer siz = tointeger (size_map[Kiwi::content_key]:""); + integer siz = 0; + if (haskey (size_map, Kiwi::content_key)) + { + siz = tointeger (size_map[Kiwi::content_key]:"0"); + } // fallback values when size is not given - if (siz == nil) + else { siz = tointeger (Kiwi::default_size); if (size_map["additive"]:"" == "") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
