Hello community,
here is the log from the commit of package yast2
checked in at Thu Oct 23 12:35:13 CEST 2008.
--------
--- yast2/yast2.changes 2008-10-13 13:12:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-10-21 10:22:40.469020000 +0200
@@ -1,0 +2,25 @@
+Mon Oct 20 17:59:57 CEST 2008 - lslezak@suse.cz
+
+- moved PackagesUI.ycp from yast2-packager, added
+ RunPackageSelector() and RunPatternSelector() functions
+ (bnc#435479)
+- 2.17.40
+
+-------------------------------------------------------------------
+Mon Oct 20 12:33:54 CEST 2008 - kmachalkova@suse.cz
+
+- bash ag_showexports moved from yast2-nfs-client package here
+ (bnc#257910)
+
+-------------------------------------------------------------------
+Thu Oct 16 15:15:02 CEST 2008 - locilka@suse.cz
+
+- Enhancing ProductControl to show internal steps names if debug
+ mode is enabled (needed for WAGON);
+
+-------------------------------------------------------------------
+Wed Oct 15 14:59:02 CEST 2008 - locilka@suse.cz
+
+- Removing SetFocus from Popup::AnyQuestion (bnc #435399).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.17.39.tar.bz2
New:
----
yast2-2.17.40.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.M29491/_old 2008-10-23 12:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.M29491/_new 2008-10-23 12:34:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.39)
+# spec file for package yast2 (Version 2.17.40)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.39
+Version: 2.17.40
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.39.tar.bz2
+Source0: yast2-2.17.40.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -147,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.39
+%setup -n yast2-2.17.40
%build
%{prefix}/bin/y2tool y2autoconf
@@ -250,7 +250,21 @@
%doc %{prefix}/share/doc/packages/yast2/system
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
+
%changelog
+* Mon Oct 20 2008 lslezak@suse.cz
+- moved PackagesUI.ycp from yast2-packager, added
+ RunPackageSelector() and RunPatternSelector() functions
+ (bnc#435479)
+- 2.17.40
+* Mon Oct 20 2008 kmachalkova@suse.cz
+- bash ag_showexports moved from yast2-nfs-client package here
+ (bnc#257910)
+* Thu Oct 16 2008 locilka@suse.cz
+- Enhancing ProductControl to show internal steps names if debug
+ mode is enabled (needed for WAGON);
+* Wed Oct 15 2008 locilka@suse.cz
+- Removing SetFocus from Popup::AnyQuestion (bnc #435399).
* Mon Oct 13 2008 lslezak@suse.cz
- fixed syntax error in media change callback (bnc#434721)
- 2.17.39
++++++ yast2-2.17.39.tar.bz2 -> yast2-2.17.40.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/configure new/yast2-2.17.40/configure
--- old/yast2-2.17.39/configure 2008-10-13 13:06:10.000000000 +0200
+++ new/yast2-2.17.40/configure 2008-10-21 10:20:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2 2.17.39.
+# Generated by GNU Autoconf 2.61 for yast2 2.17.40.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.17.39'
-PACKAGE_STRING='yast2 2.17.39'
+PACKAGE_VERSION='2.17.40'
+PACKAGE_STRING='yast2 2.17.40'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1200,7 +1200,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 2.17.39 to adapt to many kinds of systems.
+\`configure' configures yast2 2.17.40 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1271,7 +1271,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.17.39:";;
+ short | recursive ) echo "Configuration of yast2 2.17.40:";;
esac
cat <<\_ACEOF
@@ -1349,7 +1349,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.17.39
+yast2 configure 2.17.40
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1363,7 +1363,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 $as_me 2.17.39, which was
+It was created by yast2 $as_me 2.17.40, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2184,7 +2184,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.17.39'
+ VERSION='2.17.40'
cat >>confdefs.h <<_ACEOF
@@ -2412,7 +2412,7 @@
-VERSION="2.17.39"
+VERSION="2.17.40"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3427,7 +3427,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.17.39, which was
+This file was extended by yast2 $as_me 2.17.40, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3470,7 +3470,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.17.39
+yast2 config.status 2.17.40
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/configure.in new/yast2-2.17.40/configure.in
--- old/yast2-2.17.39/configure.in 2008-10-13 13:06:04.000000000 +0200
+++ new/yast2-2.17.40/configure.in 2008-10-21 10:20:23.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.39, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.40, http://bugs.opensuse.org/, yast2)
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.17.39"
+VERSION="2.17.40"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/control/src/ProductControl.ycp new/yast2-2.17.40/library/control/src/ProductControl.ycp
--- old/yast2-2.17.39/library/control/src/ProductControl.ycp 2008-10-07 17:48:19.000000000 +0200
+++ new/yast2-2.17.40/library/control/src/ProductControl.ycp 2008-10-20 13:41:14.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: ProductControl.ycp 51926 2008-10-07 14:33:34Z locilka $
+ * $Id: ProductControl.ycp 52294 2008-10-16 13:16:31Z locilka $
*/
{
textdomain "base";
@@ -707,6 +707,8 @@
*/
global define void AddWizardSteps(list<map> stagemode)
{
+ boolean debug_workflow = ProductFeatures::GetBooleanFeature ("globals", "debug_workflow");
+
last_stage_mode = stagemode;
// UI::WizardCommand() can safely be called even if the respective UI
@@ -747,26 +749,33 @@
// only for debugging
y2debug("Adding wizard step: %1", m );
+ string heading = "";
+ string label = "";
+ string id = "";
+
// Heading
if (haskey (m, "heading") && m["label"]:"" != "") {
- UI::WizardCommand (`AddStepHeading (
- haskey (m, "textdomain")
- ? dgettext (m["textdomain"]:"", m["label"]:"")
- : dgettext (wizard_textdomain, m["label"]:"")
- ));
+ heading = (
+ haskey (m, "textdomain") ?
+ dgettext (m["textdomain"]:"", m["label"]:"")
+ :
+ dgettext (wizard_textdomain, m["label"]:"")
+ );
// Label
} else if (m["label"]:"" != "") {
- if (first_id=="")
- {
+ if (first_id=="") {
first_id = m["id"]:"";
}
- UI::WizardCommand(`AddStep (
- haskey (m, "textdomain")
- ? dgettext (m["textdomain"]:"", m["label"]:"")
- : dgettext (wizard_textdomain, m["label"]:""),
- m["id"]:""
- ));
+
+ label = (
+ haskey (m, "textdomain") ?
+ dgettext (m["textdomain"]:"", m["label"]:"")
+ :
+ dgettext (wizard_textdomain, m["label"]:"")
+ );
+
+ id = m["id"]:"";
last_label = m["label"]:"";
last_domain = m["textdomain"]:"";
@@ -775,22 +784,28 @@
if (first_id=="") {
first_id = m["id"]:"";
}
+
if (last_label != "") {
if (last_domain != "") {
- UI::WizardCommand(`AddStep( dgettext(
- last_domain,
- last_label ),
- m["id"]:"" )
- );
+ label = dgettext (last_domain, last_label);
+ id = m["id"]:"";
} else {
- UI::WizardCommand(`AddStep( dgettext(
- wizard_textdomain,
- last_label ),
- m["id"]:"" )
- );
+ label = dgettext (wizard_textdomain, last_label);
}
+ id = m["id"]:"";
}
}
+
+ if (heading != nil && heading != "") {
+ UI::WizardCommand (`AddStepHeading (heading));
+ }
+
+ if (label != nil && label != "") {
+ if (debug_workflow == true) {
+ label = label + sformat (" [%1]", m["name"]:"");
+ }
+ UI::WizardCommand (`AddStep (label, id));
+ }
});
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/modules/Popup.ycp new/yast2-2.17.40/library/modules/Popup.ycp
--- old/yast2-2.17.39/library/modules/Popup.ycp 2008-10-13 12:52:00.000000000 +0200
+++ new/yast2-2.17.40/library/modules/Popup.ycp 2008-10-20 13:41:15.000000000 +0200
@@ -7,7 +7,7 @@
* Arvin Schnell
* Flags: Stable
*
- * $Id: Popup.ycp 52095 2008-10-13 08:39:27Z locilka $
+ * $Id: Popup.ycp 52252 2008-10-15 13:00:21Z locilka $
*
* Contains commonly used popup dialogs
* for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel().
@@ -336,9 +336,6 @@
any ret = nil;
- if ( focus != nil )
- UI::SetFocus(focus);
-
if (success == true) {
ret = UI::UserInput();
UI::CloseDialog();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/modules/Version.ycp new/yast2-2.17.40/library/modules/Version.ycp
--- old/yast2-2.17.39/library/modules/Version.ycp 2008-10-13 13:06:19.000000000 +0200
+++ new/yast2-2.17.40/library/modules/Version.ycp 2008-10-21 10:20:38.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.39";
+global string yast2 = "2.17.40";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/network/agents/ag_showexports new/yast2-2.17.40/library/network/agents/ag_showexports
--- old/yast2-2.17.39/library/network/agents/ag_showexports 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.17.40/library/network/agents/ag_showexports 2008-10-20 13:41:15.000000000 +0200
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# File: ag_showexports
+# Package: NFS client
+# Summary: Agent for reading the exported directories of a NFS server
+# Authors: Martin Vidner
+#
+# $Id: ag_showexports 52355 2008-10-20 09:15:52Z kmachalkova $
+#
+# Read (., "homes.example.com")
+# [ "/data/home" ]
+
+# showmount is in nfs-client.rpm
+
+if [ x$1 = x-d ]; then
+ set -x
+else
+ exec 2>/dev/null
+fi
+
+# We want to parse English output
+export LC_ALL=C
+
+OUTFILE=`mktemp -q /tmp/ag_showexports.$$.XXXXXX`
+if [ $? -ne 0 ]; then
+ # TODO y2log
+ echo "$0: Can't create temp file, exiting..." >&2
+ exit 1
+fi
+trap "rm $OUTFILE" EXIT TERM
+
+# this function is duplicated in ag_showexports and ag_hostnames
+# after $1 seconds, kill $2 and all its children
+# return $2's exit status
+function kill_after() {
+ local TIMEOUT=$1
+ local LONG_PID=$2
+
+ {
+ sleep $TIMEOUT
+ LONG_CHILDREN_PIDS=`ps --ppid $LONG_PID --no-headers -o pid`
+ kill $LONG_PID $LONG_CHILDREN_PIDS
+ } &
+ SLEEP_PID=$!
+
+ # now wait until the long command finishes or is killed
+ wait $LONG_PID
+ local RET=$?
+ # if it did not exit because of a signal,
+ # then the killer is useless and we will kill him instead
+ if [ $RET -lt 128 ]; then
+ kill $SLEEP_PID
+ fi
+ return $RET
+}
+
+# this function encapsulates a command that may take a long time
+# so that it can be killed after a timeout
+function showexports_long() {
+ local HOST="$1"
+ local SM=/usr/sbin/showmount
+ # showmounts passes whatever the server says,
+ # but it can say different things :( #91184
+ # unfsd:
+ # /space\040dir <anon clnt>
+ # /back\134slash <anon clnt>
+ # knfsd:
+ # /space dir *
+ # /back\slash *
+ if test -x "$SM"; then
+ #sed: strip authorized hosts, double \ before nondigit, make a ycp item
+ "$SM" --no-headers --exports "$HOST" | \
+ sed \
+ -e 's/<anon clnt>$//' \
+ -e 's/[[:space:]]*[^[:space:]]*$//' \
+ -e 's/\\\([^[:digit:]]\)/\\\\\1/' \
+ -e 's/\(.*\)/"\1",/'
+ else
+ echo '"Install nfs-client.rpm"'
+ fi
+}
+
+# showexports host
+# echoes the output
+function showexports() {
+ local HOST="$1"
+
+ # in parallel run:
+ # 1) the command that may take a long time
+ # 2) a shell that will kill (1) after a delay
+ showexports_long "$HOST" >"$OUTFILE" &
+ kill_after 5 $!
+
+ echo "["
+ cat "$OUTFILE"
+ echo "]"
+}
+
+while true ; do
+ IFS=
+ read COMMAND || exit
+ unset IFS
+
+ case "$COMMAND" in
+ '`result ('*)
+ exit
+ ;;
+ '`Read (.,'*)
+ HOST=$(echo "$COMMAND" | sed 's/^`Read (., *"\(.*\)")/\1/')
+ showexports "$HOST"
+ ;;
+ *)
+ echo nil
+ esac
+done
+
+# EOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/network/agents/Makefile.am new/yast2-2.17.40/library/network/agents/Makefile.am
--- old/yast2-2.17.39/library/network/agents/Makefile.am 2008-09-09 16:39:04.000000000 +0200
+++ new/yast2-2.17.40/library/network/agents/Makefile.am 2008-10-20 13:41:15.000000000 +0200
@@ -2,6 +2,13 @@
# Makefile.am for network/ifcfg agent
#
-scrconf_DATA = sysconfig_SuSEfirewall2.scr network.scr
+agent_SCRIPTS = ag_showexports
-EXTRA_DIST = sysconfig_SuSEfirewall2.scr network.scr.in
+scrconf_DATA = sysconfig_SuSEfirewall2.scr \
+ network.scr \
+ net_showexports.scr
+
+EXTRA_DIST = sysconfig_SuSEfirewall2.scr \
+ network.scr.in \
+ net_showexports.scr \
+ $(agent_SCRIPTS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/network/agents/Makefile.in new/yast2-2.17.40/library/network/agents/Makefile.in
--- old/yast2-2.17.39/library/network/agents/Makefile.in 2008-10-13 13:06:14.000000000 +0200
+++ new/yast2-2.17.40/library/network/agents/Makefile.in 2008-10-21 10:20:32.000000000 +0200
@@ -18,6 +18,7 @@
# Makefile.am for network/ifcfg agent
#
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -46,6 +47,9 @@
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = network.scr
+am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)"
+agentSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(agent_SCRIPTS)
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,7 +58,6 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(scrconfdir)"
scrconfDATA_INSTALL = $(INSTALL_DATA)
DATA = $(scrconf_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -176,8 +179,16 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-scrconf_DATA = sysconfig_SuSEfirewall2.scr network.scr
-EXTRA_DIST = sysconfig_SuSEfirewall2.scr network.scr.in
+agent_SCRIPTS = ag_showexports
+scrconf_DATA = sysconfig_SuSEfirewall2.scr \
+ network.scr \
+ net_showexports.scr
+
+EXTRA_DIST = sysconfig_SuSEfirewall2.scr \
+ network.scr.in \
+ net_showexports.scr \
+ $(agent_SCRIPTS)
+
all: all-am
.SUFFIXES:
@@ -212,6 +223,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
network.scr: $(top_builddir)/config.status $(srcdir)/network.scr.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-agentSCRIPTS: $(agent_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(agentdir)" || $(MKDIR_P) "$(DESTDIR)$(agentdir)"
+ @list='$(agent_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(agentSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(agentdir)/$$f'"; \
+ $(agentSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(agentdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-agentSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(agent_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(agentdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(agentdir)/$$f"; \
+ done
install-scrconfDATA: $(scrconf_DATA)
@$(NORMAL_INSTALL)
test -z "$(scrconfdir)" || $(MKDIR_P) "$(DESTDIR)$(scrconfdir)"
@@ -264,9 +294,9 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(scrconfdir)"; do \
+ for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -311,7 +341,7 @@
info-am:
-install-data-am: install-scrconfDATA
+install-data-am: install-agentSCRIPTS install-scrconfDATA
install-dvi: install-dvi-am
@@ -345,20 +375,21 @@
ps-am:
-uninstall-am: uninstall-scrconfDATA
+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-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
+ 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.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/network/agents/net_showexports.scr new/yast2-2.17.40/library/network/agents/net_showexports.scr
--- old/yast2-2.17.39/library/network/agents/net_showexports.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.17.40/library/network/agents/net_showexports.scr 2008-10-20 13:41:15.000000000 +0200
@@ -0,0 +1,2 @@
+.net.showexports
+`ag_showexports ()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/packages/src/PackagesUI.ycp new/yast2-2.17.40/library/packages/src/PackagesUI.ycp
--- old/yast2-2.17.39/library/packages/src/PackagesUI.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.17.40/library/packages/src/PackagesUI.ycp 2008-10-21 10:20:14.000000000 +0200
@@ -0,0 +1,338 @@
+/**
+ * Module: PackagesUI.ycp
+ *
+ * Authors: Gabriele Strattner (gs@suse.de)
+ * Ladislav Slezák
+ *
+ * Purpose: Provides common dialogs related to
+ * the package management.
+ *
+ * $Id: PackagesUI.ycp 52379 2008-10-21 08:20:13Z lslezak $
+ */
+
+{
+
+ module "PackagesUI";
+ textdomain "base";
+
+ import "Label";
+ import "Wizard";
+
+
+ //
+ // Popup displays helptext
+ //
+ global define any DisplayHelpMsg( string headline, term helptext, symbol color, integer vdim ) ``{
+
+ term dia_opt = `opt ( `decorated );
+
+ if ( color == `warncolor )
+ {
+ dia_opt = `opt ( `decorated, `warncolor );
+ }
+ else if ( color == `infocolor )
+ {
+ dia_opt = `opt ( `decorated, `infocolor );
+ }
+
+ term header = `Empty();
+ if ( headline != "" )
+ header = `Left(`Heading( headline ));
+
+ UI::OpenDialog( dia_opt,
+ `HBox( `VSpacing(vdim),
+ `VBox (`HSpacing(50),
+ header,
+ `VSpacing(0.2),
+ helptext, // e.g. `Richtext()
+ `PushButton( `id(`ok_help), `opt(`default), Label::OKButton() )
+ )
+ )
+ );
+
+ UI::SetFocus(`id(`ok_help) );
+
+ any r = UI::UserInput();
+ UI::CloseDialog();
+ return r;
+ }
+
+ /**
+ * Display unconfirmed licenses of the selected packages.
+ * @return boolean true when all licenses were accepted (or there was no license to confirm)
+ */
+ global define boolean ConfirmLicenses ()
+ {
+ boolean ret = true;
+
+ list<string> to_install = Pkg::GetPackages (`selected, true);
+ map licenses = Pkg::PkgGetLicensesToConfirm (to_install);
+
+ y2milestone("Licenses to confirm: %1", licenses);
+
+ map display_info = UI::GetDisplayInfo();
+ integer size_x = tointeger(display_info["Width"]:800);
+ integer size_y = tointeger(display_info["Height"]:600);
+ if (size_x >= 800 && size_y >= 600) {
+ size_x = 80;
+ size_y = 20;
+ } else {
+ size_x = 54;
+ size_y = 15;
+ }
+
+ foreach (string package, string license, licenses, {
+ term popup = `VBox (
+ `HSpacing (size_x),
+ // dialog heading, %1 is package name
+ `Heading (sformat (_("Confirm Package License: %1"),
+ package)),
+ `HBox (
+ `VSpacing (size_y),
+ `RichText (`id (`lic), license)
+ ),
+ `VSpacing(1),
+ `HBox (
+ `PushButton (`id (`help), Label::HelpButton ()),
+ `HStretch (),
+ // push button
+ `PushButton (`id (`accept), _("I &Agree")),
+ // push button
+ `PushButton (`id (`deny), _("I &Disagree"))
+ )
+ );
+ UI::OpenDialog (popup);
+ symbol ui = nil;
+ while (ui == nil)
+ {
+ ui = (symbol)UI::UserInput ();
+ if (ui == `help)
+ {
+ ui = nil;
+
+ // TODO FIXME: due to the textfreeze "base" cannot be used now, fix it after the GM is out!
+ textdomain "packager";
+
+ // help text
+ string help = _("<p><b><big>License Confirmation</big></b><br>
+The package in the headline of the dialog requires an explicit confirmation
+of acceptance of its license.
+If you reject the license of the package, the package will not be installed.
+<br>
+To accept the license of the package, click <b>I Agree</b>.
+To reject the license of the package, click <b>I Disagree</b></p>.");
+
+ // TODO FIXME: remove this
+ textdomain "base";
+
+ UI::OpenDialog (`HBox (
+ `VSpacing (18),
+ `VBox (
+ `HSpacing (70),
+ `RichText (help),
+ `HBox (
+ `HStretch (),
+ // push button
+ `PushButton (`id (`close), Label::CloseButton ()),
+ `HStretch ()
+ )
+ )
+ ));
+ UI::UserInput ();
+ UI::CloseDialog ();
+ }
+ }
+ UI::CloseDialog ();
+
+ y2milestone("License of package %1 accepted: %2", package, ui == `accept);
+
+ if (ui != `accept)
+ {
+ Pkg::PkgTaboo (package);
+ ret = false;
+ }
+ else
+ {
+ Pkg::PkgMarkLicenseConfirmed (package);
+ }
+ });
+
+ return ret;
+ }
+
+ /**
+ * Run helper function, reads the display_support_status feature from the control file
+ * @return boolean the read value
+ */
+ boolean ReadSupportStatus()
+ {
+ // Load the control file
+ import "ProductControl";
+ import "ProductFeatures";
+
+ boolean ret = ProductFeatures::GetBooleanFeature("software", "display_support_status");
+ y2milestone("Feature display_support_status: %1", ret);
+ return ret;
+ }
+
+ /**
+ * Start the detailed package selection.
+ * @param options options passed to the widget. All options are optional,
+ * if an option is missing or is nil the default value will be used. All options:
+ * $[ "enable_repo_mgr" : boolean // display the repository management menu,
+ * // default: false (disabled)
+ * "display_support_status" : boolean // display the support status summary dialog,
+ * // default: depends on the Product Feature "software", "display_support_status"
+ * "mode" : symbol // package selector mode, no default value
+ * ]
+ *
+ * @return symbol Returns `accept or `cancel .
+ */
+ global symbol RunPackageSelector(map options)
+ {
+ y2milestone("Called RunPackageSelector(%1)", options);
+
+ boolean enable_repo_mgr = (boolean)options["enable_repo_mgr"]:nil;
+ boolean display_support_status = (boolean)options["display_support_status"]:nil;
+ symbol mode = (symbol)options["mode"]:nil;
+
+ // set the defaults if the option is missing or nil
+ if (display_support_status == nil)
+ {
+ display_support_status = ReadSupportStatus();
+ }
+
+ if (enable_repo_mgr == nil)
+ {
+ // disable repository management by default
+ enable_repo_mgr = false;
+ }
+
+ y2milestone("Running package selection, mode: %1, options: display repo management: %2, display support status: %3", mode, enable_repo_mgr, display_support_status);
+
+ term widget_options = `opt();
+
+ if (mode != nil)
+ {
+ widget_options = add(widget_options, mode);
+ }
+
+ if (enable_repo_mgr != nil && enable_repo_mgr)
+ {
+ widget_options = add(widget_options, `repoMgr);
+ }
+
+ if (display_support_status != nil && display_support_status)
+ {
+ widget_options = add(widget_options, `confirmUnsupported);
+ }
+
+ y2milestone("Options for the package selector widget: %1", widget_options);
+
+ UI::OpenDialog(`opt(`defaultsize),
+ // Note: size(`opt()) = 0 !!
+ size(widget_options) > 1 ?
+ `PackageSelector(`id(`packages), widget_options, "")
+ : `PackageSelector(`id(`packages), "")
+ );
+
+ symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) );
+
+ UI::CloseDialog();
+ y2milestone("Package selector returned %1", result);
+
+ return result;
+ }
+
+
+ /**
+ * Start the pattern selection dialog. If the UI does not support the
+ * PatternSelector, start the detailed selection with "patterns" as the
+ * initial view.
+ * @return symbol Return `accept or `cancel
+ *
+ **/
+ global symbol RunPatternSelector()
+ {
+ y2milestone("Running pattern selection dialog");
+
+ if ( ! UI::HasSpecialWidget(`PatternSelector ) ||
+ UI::WizardCommand(`Ping() ) != true )
+ {
+ return RunPackageSelector($[]); // Fallback: detailed selection
+ }
+
+ // TODO FIXME: due to the textfreeze "base" cannot be used now, fix it after the GM is out!
+ textdomain "packager";
+
+ // Help text for software patterns / selections dialog
+ string help_text
+ = _("<p>
+ This dialog allows you to define this system's tasks and what software to install.
+ Available tasks and software for this system are shown by category in the left
+ column. To view a description for an item, select it in the list.
+ </p>")
+ + _("<p>
+ Change the status of an item by clicking its status icon
+ or right-click any icon for a context menu.
+ With the context menu, you can also change the status of all items.
+ </p>")
+ + _("<p>
+ <b>Details</b> opens the detailed software package selection
+ where you can view and select individual software packages.
+ </p>")
+ + _("<p>
+ The disk usage display in the lower right corner shows the remaining disk space
+ after all requested changes will have been performed.
+ Hard disk partitions that are full or nearly full can degrade
+ system performance and in some cases even cause serious problems.
+ The system needs some available disk space to run properly.
+ </p>");
+
+ // bugzilla #298056
+ // [ Back ] [ Cancel ] [ Accept ] buttons with [ Back ] disabled
+ Wizard::OpenNextBackDialog();
+ Wizard::SetBackButton (`back, Label::BackButton());
+ Wizard::SetAbortButton (`cancel, Label::CancelButton());
+ Wizard::SetNextButton (`accept, Label::OKButton());
+ Wizard::DisableBackButton();
+
+ Wizard::SetContents(
+ // Dialog title
+ // Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
+ _("Software Selection and System Tasks"),
+ `PatternSelector(`id(`patterns ) ),
+ help_text,
+ false, // has_back
+ true ); // has_next
+
+ // TODO FIXME: remove this
+ textdomain "base";
+
+ Wizard::SetDesktopIcon( "sw_single" );
+
+ symbol result = nil;
+
+ repeat
+ {
+ result = (symbol) UI::RunPkgSelection(`id(`patterns ) );
+ y2milestone( "Pattern selector returned %1", result );
+
+ if ( result == `details )
+ {
+ result = RunPackageSelector($[]);
+
+ if ( result == `cancel )
+ // don't get all the way out - the user might just have
+ // been scared of the gory details.
+ result = nil;
+ }
+ } until ( result == `cancel || result == `accept );
+
+ Wizard::CloseDialog();
+
+ y2milestone("Pattern selector returned %1", result);
+ return result;
+ }
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/library/runlevel/src/Service.ycp new/yast2-2.17.40/library/runlevel/src/Service.ycp
--- old/yast2-2.17.39/library/runlevel/src/Service.ycp 2008-10-03 07:05:22.000000000 +0200
+++ new/yast2-2.17.40/library/runlevel/src/Service.ycp 2008-10-20 13:41:15.000000000 +0200
@@ -8,7 +8,7 @@
* Lukas Ocilka
* Flags: Stable
*
- * $Id: Service.ycp 51794 2008-10-02 12:32:26Z mzugec $
+ * $Id: Service.ycp 52242 2008-10-15 12:39:55Z locilka $
*
* Functions for service (init script) handling used by other modules.
*/
@@ -232,13 +232,15 @@
return false;
}
- if (rls != "")
- {
- map ret = (map)SCR::Execute (.target.bash_output,
- sformat ("/sbin/insserv -f %2/%1,start=%3",
- name, init_d, rls));
- if (0 != ret["exit"]:-1)
- {
+ // script has already been completely disabled
+ // enable in required runlevels if needed
+ if (rls != "") {
+ string command = sformat ("/sbin/insserv -f %2/%1,start=%3", name, init_d, rls);
+ y2milestone ("Calling %1", command);
+
+ map ret = (map)SCR::Execute (.target.bash_output, command);
+
+ if (0 != ret["exit"]:-1) {
// Error message.
// %1 is a name of an init script in /etc/init.d,
// Enabling means that the service should start
@@ -251,6 +253,7 @@
return false;
}
}
+
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.39/VERSION new/yast2-2.17.40/VERSION
--- old/yast2-2.17.39/VERSION 2008-10-13 13:05:28.000000000 +0200
+++ new/yast2-2.17.40/VERSION 2008-10-21 10:19:04.000000000 +0200
@@ -1 +1 @@
-2.17.39
+2.17.40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org