Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2013-08-05 20:56:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2013-08-01 11:09:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2013-08-05 20:56:09.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 1 20:12:44 UTC 2013 - lslezak@suse.cz + +- removed obsolete BuildRequires: gcc-c++ perl-XML-Writer + yast2-slp yast2-transfer +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.0.0.tar.bz2 New: ---- yast2-packager-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.yxvUBP/_old 2013-08-05 20:56:10.000000000 +0200 +++ /var/tmp/diff_new_pack.yxvUBP/_new 2013-08-05 20:56:10.000000000 +0200 @@ -17,24 +17,18 @@ Name: yast2-packager -Version: 3.0.0 +Version: 3.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-packager-%{version}.tar.bz2 -BuildRequires: gcc-c++ -BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2-country-data BuildRequires: yast2-devtools -BuildRequires: yast2-slp BuildRequires: yast2-testsuite BuildRequires: yast2-xml -# HTTP.ycp -BuildRequires: yast2-transfer - # Kernel::InformAboutKernelChange BuildRequires: yast2 >= 2.23.8 ++++++ yast2-packager-3.0.0.tar.bz2 -> yast2-packager-3.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/Makefile.am new/yast2-packager-3.0.1/Makefile.am --- old/yast2-packager-3.0.0/Makefile.am 2013-07-31 11:49:42.000000000 +0200 +++ new/yast2-packager-3.0.1/Makefile.am 2013-08-02 20:40:32.000000000 +0200 @@ -193,4 +193,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents doc src testsuite +SUBDIRS = doc src testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/Makefile.am.common new/yast2-packager-3.0.1/Makefile.am.common --- old/yast2-packager-3.0.0/Makefile.am.common 2013-07-31 11:49:42.000000000 +0200 +++ new/yast2-packager-3.0.1/Makefile.am.common 2013-08-02 20:40:32.000000000 +0200 @@ -30,10 +30,10 @@ dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -42,6 +42,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/Makefile.in new/yast2-packager-3.0.1/Makefile.in --- old/yast2-packager-3.0.0/Makefile.in 2013-07-31 11:49:46.000000000 +0200 +++ new/yast2-packager-3.0.1/Makefile.in 2013-08-02 20:40:36.000000000 +0200 @@ -321,7 +321,7 @@ TAGVERSION = $(Y2TOOL) tagversion # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents doc src testsuite +SUBDIRS = doc src testsuite all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/VERSION new/yast2-packager-3.0.1/VERSION --- old/yast2-packager-3.0.0/VERSION 2013-07-30 13:20:09.000000000 +0200 +++ new/yast2-packager-3.0.1/VERSION 2013-08-02 20:40:25.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/agents/Makefile.am new/yast2-packager-3.0.1/agents/Makefile.am --- old/yast2-packager-3.0.0/agents/Makefile.am 2013-01-22 11:40:37.000000000 +0100 +++ new/yast2-packager-3.0.1/agents/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# Makefile.am for packager/agents -# - -agent_SCRIPTS = \ - ag_zypp_repos - -scrconf_DATA = \ - etc_zypp_conf.scr \ - zypp_repos.scr - -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/agents/Makefile.in new/yast2-packager-3.0.1/agents/Makefile.in --- old/yast2-packager-3.0.0/agents/Makefile.in 2013-07-31 11:49:46.000000000 +0200 +++ new/yast2-packager-3.0.1/agents/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,479 +0,0 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Makefile.am for packager/agents -# - - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = agents -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { 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 -DATA = $(scrconf_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINTAINER = @MAINTAINER@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RPMNAME = @RPMNAME@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -STYLESHEET_CSS = @STYLESHEET_CSS@ -STYLESHEET_HTML = @STYLESHEET_HTML@ -STYLESHEET_PDF = @STYLESHEET_PDF@ -STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ -STYLESHEET_YDOC = @STYLESHEET_YDOC@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -agentdir = @agentdir@ -am__leading_dot = @am__leading_dot@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -clientdir = @clientdir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -desktopdir = @desktopdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -execcompdir = @execcompdir@ -fillupdir = @fillupdir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -imagedir = @imagedir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -moduledir = @moduledir@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgconfigdatadir = @pkgconfigdatadir@ -pkgconfigdir = @pkgconfigdir@ -plugindir = @plugindir@ -potdir = @potdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -schemadir = @schemadir@ -scrconfdir = @scrconfdir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -themedir = @themedir@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -yast2dir = @yast2dir@ -ybindir = @ybindir@ -ydatadir = @ydatadir@ -yncludedir = @yncludedir@ -ystartupdir = @ystartupdir@ -agent_SCRIPTS = \ - ag_zypp_repos - -scrconf_DATA = \ - etc_zypp_conf.scr \ - zypp_repos.scr - -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agents/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu agents/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(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=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(scrconfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(scrconfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(scrconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(scrconfdir)" || exit $$?; \ - done - -uninstall-scrconfDATA: - @$(NORMAL_UNINSTALL) - @list='$(scrconf_DATA)'; test -n "$(scrconfdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(scrconfdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(SCRIPTS) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-agentSCRIPTS install-scrconfDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-agentSCRIPTS 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 - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/agents/ag_zypp_repos new/yast2-packager-3.0.1/agents/ag_zypp_repos --- old/yast2-packager-3.0.0/agents/ag_zypp_repos 2013-01-22 11:40:37.000000000 +0100 +++ new/yast2-packager-3.0.1/agents/ag_zypp_repos 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -#!/usr/bin/perl -w - -# -# Name: ag_zypp_repos -# Authors: Lukas Ocilka <locilka@suse.cz> -# Summary: Reads directory of zypp repositories and parses files -# found. Returns them as a map. -# - -use strict; -use lib "/usr/lib/YaST2/agents_non_y2"; -use ycp; - -while (<STDIN>) { - my ($command, $path, $dir) = ycp::ParseCommand ($_); - - if ($command eq "Read") { - if (! defined $dir || $dir eq "") { - $dir = '/etc/zypp/repos.d/'; - y2milestone ("Using default dir: ".$dir); - } - - if (! -d $dir) { - y2error ("Directory ".$dir." doesn't exist!"); - ycp::Return (undef); - next; - } - - y2milestone ("Reading: '".$dir."'"); - - my @zypp_repos = (); - - opendir (DIR, $dir); - my @files = grep (!/^\.{1,2}$/, readdir(DIR)); - closedir(DIR); - - foreach my $file (@files) { - my $this_entry = {}; - - $file = $dir.'/'.$file; - y2milestone ("Parsing file: ".$file); - open (FILE, $file) || do { - y2error ("Cannot open file ".$file.": ".$!); - next; - }; - my @lines = <FILE>; - close FILE; - - foreach my $line (@lines) { - chop $line; - - if ($line =~ /^[ \t]*\[([^\]]+)\][ \t]*$/) { - $this_entry->{'id'} = $1; - } elsif ($line =~ /^([^=]+)[ \t]*=[ \t]*(.*)$/) { - $this_entry->{$1} = $2; - } - } - - push @zypp_repos, $this_entry; - } - - ycp::Return (\@zypp_repos); - } elsif ($command eq "result") { - exit 0; - } else { - my $return_value = sprintf( "Unknown instruction %s", $command); - ycp::Return ($return_value); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/agents/etc_zypp_conf.scr new/yast2-packager-3.0.1/agents/etc_zypp_conf.scr --- old/yast2-packager-3.0.0/agents/etc_zypp_conf.scr 2013-01-22 11:40:37.000000000 +0100 +++ new/yast2-packager-3.0.1/agents/etc_zypp_conf.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -/** - * File: - * etc_zypp_conf.scr - * - * Summary: - * SCR Agent for reading/writing /etc/zypp/zypp.conf file - * using the ini-agent - * - * Access: - * read/write - * - * Authors: - * Ladislav Slezak <lslezak@suse.cz> - * - * Example: - * - * Get list of sections - * SCR::Dir(.etc.zypp_conf.section) - * - * Get a value - * SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") - * - * Flush the changes - * SCR::Write(.etc.zypp_conf, nil) - * - * - * Fore more information see the INI-agent documentation - * - * $Id$ - */ - -.etc.zypp_conf - -`ag_ini( - `IniAgent( "/etc/zypp/zypp.conf" , $[ - "options" : [ "no_nested_sections", "line_can_continue", "comments_last" ], - "comments": [ - "^[ \t]*$", // empty line - "^[ \t]*#.*$", // comment char - ], - "sections" : [ - $[ - "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], - ] - ], - "params" : [ - $[ - "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"], - ] - ] - ] - ) -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/agents/zypp_repos.scr new/yast2-packager-3.0.1/agents/zypp_repos.scr --- old/yast2-packager-3.0.0/agents/zypp_repos.scr 2013-01-22 11:40:37.000000000 +0100 +++ new/yast2-packager-3.0.1/agents/zypp_repos.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -/** - * File: zypp_repos.scr - * - * Summary: Agent for reading zypp repos in a defined directory - * - * Authors: Lukas Ocilka <locilka@suse.cz> - * - * Example: SCR::Read (.zypp_repos, "/etc/zypp/repo.d/") - * - * $Id$ - */ - -.zypp_repos - -`ag_zypp_repos () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/configure new/yast2-packager-3.0.1/configure --- old/yast2-packager-3.0.0/configure 2013-07-31 11:49:45.000000000 +0200 +++ new/yast2-packager-3.0.1/configure 2013-08-02 20:40:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-packager 3.0.0. +# Generated by GNU Autoconf 2.69 for yast2-packager 3.0.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='yast2-packager 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='yast2-packager 3.0.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-packager 3.0.0 to adapt to many kinds of systems. +\`configure' configures yast2-packager 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 3.0.0:";; + short | recursive ) echo "Configuration of yast2-packager 3.0.1:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 3.0.0 +yast2-packager configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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-packager $as_me 3.0.0, which was +It was created by yast2-packager $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='3.0.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -2842,7 +2842,7 @@ -ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" +ac_config_files="$ac_config_files Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3403,7 +3403,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 3.0.0, which was +This file was extended by yast2-packager $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,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-packager config.status 3.0.0 +yast2-packager config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3570,7 +3570,6 @@ do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "agents/Makefile") CONFIG_FILES="$CONFIG_FILES agents/Makefile" ;; "doc/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/autodocs/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/configure.ac new/yast2-packager-3.0.1/configure.ac --- old/yast2-packager-3.0.0/configure.ac 2013-07-31 11:49:42.000000000 +0200 +++ new/yast2-packager-3.0.1/configure.ac 2013-08-02 20:40:32.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.1 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-packager, 3.0.0, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 3.0.1, http://bugs.opensuse.org/, yast2-packager) 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="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -150,8 +150,7 @@ ]) -AC_CONFIG_FILES(Makefile agents/Makefile -doc/autodocs/Makefile +AC_CONFIG_FILES(Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/src/Makefile.am new/yast2-packager-3.0.1/src/Makefile.am --- old/yast2-packager-3.0.0/src/Makefile.am 2013-07-30 13:20:09.000000000 +0200 +++ new/yast2-packager-3.0.1/src/Makefile.am 2013-08-02 20:40:25.000000000 +0200 @@ -58,11 +58,18 @@ ynclude1_DATA = \ include/checkmedia/ui.rb +scrconf_DATA = \ + scrconf/etc_zypp_conf.scr \ + scrconf/zypp_repos.scr + +agent_SCRIPTS = \ + servers_non_y2/ag_zypp_repos + desktop_DATA = \ desktop/sw_source.desktop \ desktop/sw_single.desktop \ desktop/checkmedia.desktop -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ynclude1_DATA) $(desktop_DATA) +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ynclude1_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(desktop_DATA) -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/src/Makefile.in new/yast2-packager-3.0.1/src/Makefile.in --- old/yast2-packager-3.0.0/src/Makefile.in 2013-07-31 11:49:46.000000000 +0200 +++ new/yast2-packager-3.0.1/src/Makefile.in 2013-08-02 20:40:37.000000000 +0200 @@ -19,6 +19,7 @@ # Makefile.am.common -*- Makefile -*- # Generated file, do not edit! + VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -66,13 +67,6 @@ 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/||"`;; \ @@ -100,11 +94,20 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ +am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(clientdir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" \ + "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)" \ "$(DESTDIR)$(yncludedir)" "$(DESTDIR)$(ynclude1dir)" +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 DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \ - $(ynclude_DATA) $(ynclude1_DATA) + $(scrconf_DATA) $(ynclude_DATA) $(ynclude1_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -280,12 +283,19 @@ ynclude1_DATA = \ include/checkmedia/ui.rb +scrconf_DATA = \ + scrconf/etc_zypp_conf.scr \ + scrconf/zypp_repos.scr + +agent_SCRIPTS = \ + servers_non_y2/ag_zypp_repos + desktop_DATA = \ desktop/sw_source.desktop \ desktop/sw_single.desktop \ desktop/checkmedia.desktop -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ynclude1_DATA) $(desktop_DATA) +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ynclude1_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(desktop_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) @@ -333,6 +343,41 @@ $(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-clientDATA: $(client_DATA) @$(NORMAL_INSTALL) @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ @@ -417,6 +462,27 @@ @list='$(modulebin_DATA)'; test -n "$(modulebindir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(modulebindir)'; $(am__uninstall_files_from_dir) +install-scrconfDATA: $(scrconf_DATA) + @$(NORMAL_INSTALL) + @list='$(scrconf_DATA)'; test -n "$(scrconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(scrconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(scrconfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(scrconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(scrconfdir)" || exit $$?; \ + done + +uninstall-scrconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(scrconf_DATA)'; test -n "$(scrconfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(scrconfdir)'; $(am__uninstall_files_from_dir) install-yncludeDATA: $(ynclude_DATA) @$(NORMAL_INSTALL) @list='$(ynclude_DATA)'; test -n "$(yncludedir)" || list=; \ @@ -503,9 +569,9 @@ dist-hook check-am: all-am check: check-am -all-am: Makefile $(DATA) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)" "$(DESTDIR)$(ynclude1dir)"; do \ + for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)" "$(DESTDIR)$(yncludedir)" "$(DESTDIR)$(ynclude1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -560,9 +626,9 @@ info-am: -install-data-am: install-clientDATA install-desktopDATA \ - install-moduleDATA install-modulebinDATA install-ynclude1DATA \ - install-yncludeDATA +install-data-am: install-agentSCRIPTS install-clientDATA \ + install-desktopDATA install-moduleDATA install-modulebinDATA \ + install-scrconfDATA install-ynclude1DATA install-yncludeDATA install-dvi: install-dvi-am @@ -606,26 +672,29 @@ ps-am: -uninstall-am: uninstall-clientDATA uninstall-desktopDATA \ - uninstall-moduleDATA uninstall-modulebinDATA \ +uninstall-am: uninstall-agentSCRIPTS uninstall-clientDATA \ + uninstall-desktopDATA uninstall-moduleDATA \ + uninstall-modulebinDATA uninstall-scrconfDATA \ uninstall-ynclude1DATA uninstall-yncludeDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-clientDATA \ - install-data install-data-am install-desktopDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-moduleDATA install-modulebinDATA install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ + info info-am install install-agentSCRIPTS install-am \ + install-clientDATA install-data install-data-am \ + install-desktopDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-moduleDATA \ + install-modulebinDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-scrconfDATA install-strip \ install-ynclude1DATA install-yncludeDATA installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-clientDATA \ - uninstall-desktopDATA uninstall-moduleDATA \ - uninstall-modulebinDATA uninstall-ynclude1DATA \ + pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \ + uninstall-clientDATA uninstall-desktopDATA \ + uninstall-moduleDATA uninstall-modulebinDATA \ + uninstall-scrconfDATA uninstall-ynclude1DATA \ uninstall-yncludeDATA @@ -642,10 +711,10 @@ rm ${NEWDEP} dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -654,6 +723,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/src/scrconf/etc_zypp_conf.scr new/yast2-packager-3.0.1/src/scrconf/etc_zypp_conf.scr --- old/yast2-packager-3.0.0/src/scrconf/etc_zypp_conf.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.0.1/src/scrconf/etc_zypp_conf.scr 2013-08-02 20:40:25.000000000 +0200 @@ -0,0 +1,54 @@ +/** + * File: + * etc_zypp_conf.scr + * + * Summary: + * SCR Agent for reading/writing /etc/zypp/zypp.conf file + * using the ini-agent + * + * Access: + * read/write + * + * Authors: + * Ladislav Slezak <lslezak@suse.cz> + * + * Example: + * + * Get list of sections + * SCR::Dir(.etc.zypp_conf.section) + * + * Get a value + * SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") + * + * Flush the changes + * SCR::Write(.etc.zypp_conf, nil) + * + * + * Fore more information see the INI-agent documentation + * + * $Id$ + */ + +.etc.zypp_conf + +`ag_ini( + `IniAgent( "/etc/zypp/zypp.conf" , $[ + "options" : [ "no_nested_sections", "line_can_continue", "comments_last" ], + "comments": [ + "^[ \t]*$", // empty line + "^[ \t]*#.*$", // comment char + ], + "sections" : [ + $[ + "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], + ] + ], + "params" : [ + $[ + "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"], + ] + ] + ] + ) +) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/src/scrconf/zypp_repos.scr new/yast2-packager-3.0.1/src/scrconf/zypp_repos.scr --- old/yast2-packager-3.0.0/src/scrconf/zypp_repos.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.0.1/src/scrconf/zypp_repos.scr 2013-08-02 20:40:25.000000000 +0200 @@ -0,0 +1,15 @@ +/** + * File: zypp_repos.scr + * + * Summary: Agent for reading zypp repos in a defined directory + * + * Authors: Lukas Ocilka <locilka@suse.cz> + * + * Example: SCR::Read (.zypp_repos, "/etc/zypp/repo.d/") + * + * $Id$ + */ + +.zypp_repos + +`ag_zypp_repos () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.0/src/servers_non_y2/ag_zypp_repos new/yast2-packager-3.0.1/src/servers_non_y2/ag_zypp_repos --- old/yast2-packager-3.0.0/src/servers_non_y2/ag_zypp_repos 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.0.1/src/servers_non_y2/ag_zypp_repos 2013-08-02 20:40:25.000000000 +0200 @@ -0,0 +1,69 @@ +#!/usr/bin/perl -w + +# +# Name: ag_zypp_repos +# Authors: Lukas Ocilka <locilka@suse.cz> +# Summary: Reads directory of zypp repositories and parses files +# found. Returns them as a map. +# + +use strict; +use lib "/usr/lib/YaST2/agents_non_y2"; +use ycp; + +while (<STDIN>) { + my ($command, $path, $dir) = ycp::ParseCommand ($_); + + if ($command eq "Read") { + if (! defined $dir || $dir eq "") { + $dir = '/etc/zypp/repos.d/'; + y2milestone ("Using default dir: ".$dir); + } + + if (! -d $dir) { + y2error ("Directory ".$dir." doesn't exist!"); + ycp::Return (undef); + next; + } + + y2milestone ("Reading: '".$dir."'"); + + my @zypp_repos = (); + + opendir (DIR, $dir); + my @files = grep (!/^\.{1,2}$/, readdir(DIR)); + closedir(DIR); + + foreach my $file (@files) { + my $this_entry = {}; + + $file = $dir.'/'.$file; + y2milestone ("Parsing file: ".$file); + open (FILE, $file) || do { + y2error ("Cannot open file ".$file.": ".$!); + next; + }; + my @lines = <FILE>; + close FILE; + + foreach my $line (@lines) { + chop $line; + + if ($line =~ /^[ \t]*\[([^\]]+)\][ \t]*$/) { + $this_entry->{'id'} = $1; + } elsif ($line =~ /^([^=]+)[ \t]*=[ \t]*(.*)$/) { + $this_entry->{$1} = $2; + } + } + + push @zypp_repos, $this_entry; + } + + ycp::Return (\@zypp_repos); + } elsif ($command eq "result") { + exit 0; + } else { + my $return_value = sprintf( "Unknown instruction %s", $command); + ycp::Return ($return_value); + } +} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org