Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Fri Nov 27 14:12:38 CET 2009. -------- --- yast2/yast2.changes 2009-10-26 16:56:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2009-11-26 18:57:37.000000000 +0100 @@ -1,0 +2,31 @@ +Thu Nov 26 18:10:42 CET 2009 - kmachalkova@suse.cz + +- Fixed striping trailing \n from Hostname::CurrentHostname() + (bnc#553213) +- 2.19.0 + +------------------------------------------------------------------- +Thu Nov 26 07:51:09 UTC 2009 - lslezak@suse.cz + +- PackageLock - use "Software Management" term consistently + (bnc#558625) + +------------------------------------------------------------------- +Thu Nov 19 16:51:55 CET 2009 - locilka@susue.cz + +- REGISTERPRODUCT from content file moved to control file to + globals->require_registration (FATE #305578) +- Extended SuSEFirewallServices module (FATE #306804) + +------------------------------------------------------------------- +Tue Nov 10 10:07:01 CET 2009 - jsuchome@suse.cz + +- SERVICES.pm: use ruby-bindings to read yml file (bnc#551276) + +------------------------------------------------------------------- +Fri Nov 6 14:05:03 CET 2009 - jsrain@suse.cz + +- issue an error message instead of trying to start YaST in + NCurses without a terminal available (bnc#502688) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.18.28.tar.bz2 New: ---- yast2-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.QUI2KV/_old 2009-11-27 14:11:37.000000000 +0100 +++ /var/tmp/diff_new_pack.QUI2KV/_new 2009-11-27 14:11:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.18.28) +# spec file for package yast2 (Version 2.19.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2 -Version: 2.18.28 +Version: 2.19.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.18.28.tar.bz2 +Source0: yast2-2.19.0.tar.bz2 Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPLv2+ Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite # Needed already in build time @@ -96,7 +96,7 @@ installation with YaST2 %package devel-doc -License: GPL v2 or later +License: GPLv2+ Requires: yast2 = %version Group: System/YaST Provides: yast2-lib-sequencer-devel @@ -111,7 +111,7 @@ installation with YaST2. %prep -%setup -n yast2-2.18.28 +%setup -n yast2-2.19.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.18.28.tar.bz2 -> yast2-2.19.0.tar.bz2 ++++++ ++++ 2112 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/autodocs-ycp.ami new/yast2-2.19.0/autodocs-ycp.ami --- old/yast2-2.18.28/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.19.0/autodocs-ycp.ami 2009-09-04 19:16:56.000000000 +0200 @@ -0,0 +1,32 @@ +# -*- makefile -*- Automake include file +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ + +# Builds source documentation for YCP sources +# Uses ycpdoc +# PARAMETERS: +# AUTODOCS_YCP: Files that the ycp autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src + +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs + +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) +CLEANFILES = $(html_DATA) pod2htm*.tmp + +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + for i in $(AUTODOCS_PM); do \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ + done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/configure.in new/yast2-2.19.0/configure.in --- old/yast2-2.18.28/configure.in 2009-04-01 11:00:34.000000000 +0200 +++ new/yast2-2.19.0/configure.in 2009-09-04 19:16:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.18.13, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.23, 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.18.13" +VERSION="2.18.23" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/library/control/src/WorkflowManager.ycp new/yast2-2.19.0/library/control/src/WorkflowManager.ycp --- old/yast2-2.18.28/library/control/src/WorkflowManager.ycp 2008-11-18 12:23:54.000000000 +0100 +++ new/yast2-2.19.0/library/control/src/WorkflowManager.ycp 2009-11-26 18:02:38.000000000 +0100 @@ -67,6 +67,12 @@ global list <string> additional_finish_steps_after_chroot = []; global list <string> additional_finish_steps_before_umount = []; + // FATE #305578: Add-On Product Requiring Registration + // $[ "workflow filename" : (boolean) require_registration ] + list <string> workflows_requiring_registration = []; + + map <string, integer> workflows_to_sources = $[]; + boolean base_workflow_stored = false; /* Contains all currently workflows added to the Workflow Store */ @@ -281,6 +287,9 @@ additional_finish_steps_after_chroot = []; additional_finish_steps_before_umount = []; + workflows_requiring_registration = []; + workflows_to_sources = $[]; + // reset internal variable to force the Prepare... function system_proposals_prepared = false; PrepareSystemProposals(); @@ -373,7 +382,7 @@ * @param string name with unique identification * @return string path to already cached workflow file, control file is downloaded if not yet chached */ - string GetCachedWorkflowFilename (symbol type, integer src_id, string name) { + global string GetCachedWorkflowFilename (symbol type, integer src_id, string name) { if (type == `addon) { string disk_filename = GenerateAdditionalControlFilePath (src_id, ""); @@ -436,6 +445,7 @@ unmerged_changes = true; used_workflows = add (used_workflows, used_filename); + workflows_to_sources[used_filename] = src_id; } return true; @@ -478,6 +488,10 @@ return one_workflow != used_filename; }); + if (haskey (workflows_to_sources, used_filename)) { + workflows_to_sources = remove (workflows_to_sources, used_filename); + } + if (! Stage::initial()) { if (FileUtils::Exists (used_filename)) { y2milestone ("Removing cached file '%1': %2", @@ -956,13 +970,68 @@ } /** + * Returns list of workflows requiring registration + * + * @see FATE #305578: Add-On Product Requiring Registration + */ + global list <string> WorkflowsRequiringRegistration () { + return workflows_requiring_registration; + } + + /** + * Returns whether a repository workflow requires registration + * + * @param integer src_id + * @return boolean if registration is required + */ + global boolean WorkflowRequiresRegistration (integer src_id) { + boolean ret = false; + + y2milestone ("Known workflows: %1", workflows_to_sources); + y2milestone ("Workflows requiring registration: %1", workflows_requiring_registration); + + foreach (string one_workflow, integer id, workflows_to_sources, { + // sources match and workflow is listed as 'requiring registration' + if (src_id == id && contains (workflows_requiring_registration, one_workflow)) { + ret = true; + break; + } + }); + + y2milestone ("WorkflowRequiresRegistration(%1): %2", src_id, ret); + return ret; + } + + global boolean IncorporateControlFileOptions (string filename) { + map update_file = XML::XMLToYCPFile (filename); + if (update_file == nil) { + y2error ("Unable to read the %1 control file", filename); + return false; + } + + // FATE #305578: Add-On Product Requiring Registration + map <string, any> globals = update_file["globals"]:$[]; + + if (haskey(globals, "require_registration") && globals["require_registration"]:false == true) { + y2milestone ("Registration is required by %1", filename); + workflows_requiring_registration = toset (add (workflows_requiring_registration, filename)); + y2milestone ("Workflows requiring registration: %1", workflows_requiring_registration); + } else { + y2milestone ("Registration is not required by %1", filename); + } + + return true; + } + + /** * Update product options such as global settings, software, partitioning * or network. * * @param update_file a map containing update control file + * @param * @return boolean true on success */ - boolean UpdateProductInfo (map update_file) { + boolean UpdateProductInfo (map update_file, string filename) { // merging all 'map <string, any>' type foreach (string section, ["globals", "software", "partitioning", "network"], { map <string, any> sect = ProductFeatures::GetSection (section); @@ -1048,7 +1117,7 @@ return false; } - if (! UpdateProductInfo (update_file)) { + if (! UpdateProductInfo (update_file, filename)) { y2error ("Failed to set product options"); return false; } @@ -1127,6 +1196,8 @@ y2error ("Workflow ident is: %1", workflow_ident); } + IncorporateControlFileOptions (one_workflow); + if (! IntegrateWorkflow (one_workflow)) { y2error ("Merging '%1' failed!", one_workflow); Report::Error (_("An internal error occured when integrating additional workflow.")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/library/modules/Version.ycp new/yast2-2.19.0/library/modules/Version.ycp --- old/yast2-2.18.28/library/modules/Version.ycp 2009-10-26 16:55:45.000000000 +0100 +++ new/yast2-2.19.0/library/modules/Version.ycp 2009-11-26 18:56:37.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.18.28"; +global string yast2 = "2.19.0"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/library/network/src/SuSEFirewallServices.ycp new/yast2-2.19.0/library/network/src/SuSEFirewallServices.ycp --- old/yast2-2.18.28/library/network/src/SuSEFirewallServices.ycp 2008-09-04 14:31:34.000000000 +0200 +++ new/yast2-2.19.0/library/network/src/SuSEFirewallServices.ycp 2009-11-26 18:02:38.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Definition of Supported Firewall Services and Port Aliases. * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: SuSEFirewallServices.ycp 49750 2008-08-06 08:52:18Z locilka $ + * $Id: SuSEFirewallServices.ycp 59655 2009-11-20 11:54:50Z locilka $ * * Global Definition of Firewall Services * Defined using TCP, UDP and RPC ports and IP protocols and Broadcast UDP @@ -466,6 +466,16 @@ } /** + * Function returns description of a firewall service + * + * @param string service + * @return string service description + */ + global define string GetDescription (string service) { + return SERVICES[service,"description"]:""; + } + + /** * Sets that configuration was modified */ global void SetModified () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/library/packages/src/PackageLock.ycp new/yast2-2.19.0/library/packages/src/PackageLock.ycp --- old/yast2-2.18.28/library/packages/src/PackageLock.ycp 2009-09-25 17:32:11.000000000 +0200 +++ new/yast2-2.19.0/library/packages/src/PackageLock.ycp 2009-11-26 18:02:38.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Packages manipulation (system) * Authors: Martin Vidner <mvidner@suse.cz> * - * $Id: PackageLock.ycp 58210 2009-07-30 07:36:45Z jsuchome $ + * $Id: PackageLock.ycp 59764 2009-11-26 07:53:10Z lslezak $ * * This should be used everywhere before Pkg is first used. #160319 */ @@ -42,11 +42,11 @@ if (have_lock != true) { try_again = (Popup::AnyQuestion ( // TRANSLATORS: a popup headline - _("Accessing the Package Management Failed"), + _("Accessing the Software Management Failed"), Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question _("Would you like to continue without having access -to the package management or retry to access it? +to the software management or retry to access it? "), Label::ContinueButton(), Label::RetryButton(), @@ -87,11 +87,11 @@ { symbol ret = Popup::AnyQuestion3( // TRANSLATORS: a popup headline - _("Accessing the Package Management Failed"), + _("Accessing the Softwaree Management Failed"), Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question - _("Would you like to retry accessing the package manager, -continue without having access to package management, + _("Would you like to retry accessing the software manager, +continue without having access to the software management, or abort? "), Label::RetryButton(), @@ -113,7 +113,7 @@ { boolean ret = Popup::AnyQuestion( // TRANSLATORS: a popup headline - _("Accessing the Package Management Failed"), + _("Accessing the Software Management Failed"), Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question _("Would you like to abort or try again?\n"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/library/runlevel/src/YaPI/SERVICES.pm new/yast2-2.19.0/library/runlevel/src/YaPI/SERVICES.pm --- old/yast2-2.18.28/library/runlevel/src/YaPI/SERVICES.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.19.0/library/runlevel/src/YaPI/SERVICES.pm 2009-11-26 18:02:38.000000000 +0100 @@ -0,0 +1,182 @@ +package YaPI::SERVICES; + +use strict; +use YaST::YCP qw(:LOGGING); +use YaPI; +use Data::Dumper; + +# ------------------- imported modules +YaST::YCP::Import ("Directory"); +YaST::YCP::Import ("FileUtils"); +YaST::YCP::Import ("Package"); +YaST::YCP::Import ("Service"); +YaST::YCP::Import ("SCR"); +# ------------------------------------- + +our $VERSION = '1.0.0'; +our @CAPABILITIES = ('SLES11'); +our %TYPEINFO; + +my $custom_services_file = "/etc/webyast/custom_services.yml"; + +my $error_message = ""; + +# log error message and fill it into $error_message variable +sub report_error { + $error_message = shift; + y2error ($error_message); +} + +# parse the file with custom services and return the hash describing the file +sub parse_custom_services { + + if (!FileUtils->Exists ($custom_services_file)) { + report_error ("$custom_services_file file not present"); + return {}; + } + + if (!Package->Installed ("yast2-ruby-bindings")) { + report_error ("yast2-ruby-bindings not installed, cannot read custom services"); + return {}; + } + + if (!FileUtils->Exists (Directory->moduledir()."/YML.rb")) { + report_error ("YML.rb not present, cannot parse config file"); + return {}; + } + + YaST::YCP::Import ("YML"); + + my $parsed = YML->parse ($custom_services_file); + + if (!defined $parsed || ref ($parsed) ne "HASH") { + report_error ("custom services file could not be read"); + return {}; + } + return $parsed; +} + +# read the list of custom services and return the information about them +# if requested, read the status of services +sub read_custom_services { + + my $args = shift; + my @ret = (); + my $services = parse_custom_services (); + foreach my $name (keys %$services) { + my $s = { + "name" => $name, + "description" => $services->{$name}{"description"} || "" + }; + if ($args->{"read_status"} || 0) + { + my $cmd = $services->{$name}{"status"}; + if (!$cmd) { + report_error ("status script for $name not defined or empty"); + next; + } + my $out = SCR->Execute (".target.bash_output", $cmd); + $s->{"status"} = $out->{"exit"}; + } + push @ret, $s; + } + return \@ret; +} + +# read infomation about custom service and execute given command with it +sub execute_custom_script { + + my $name = shift; + my $action = shift; + my $services = parse_custom_services (); + my $ret = { + "stdout" => "", + "stderr" => "failure", + "exit" => 255 + }; + + if (%$services) { + my $service = $services->{$name}; + if (!defined $service || ref ($service) ne "HASH" || ! %$service) { + report_error ("service $name not defined or empty in config file"); + $ret->{"stderr"} = $error_message; + return $ret; + } + my $cmd = $services->{$name}{$action}; + if (!$cmd) { + report_error ("'$action' script for $name not defined or empty"); + $ret->{"stderr"} = $error_message; + return $ret; + } + $ret = SCR->Execute (".target.bash_output", $cmd); + } + return $ret; +} + +# Return the map of services enabled in given runlevel +# Parameter is an argument map with possible keys: +# "runlevel" : integer +# "read_status" : if present, service status will be queried +# "custom" : if present, custom services (defined in config file) will be read +# returns array of hashes +BEGIN{$TYPEINFO{Read} = ["function", + ["list", [ "map", "string", "any"]], + ["map", "string", "any"]]; +} +sub Read { + + my $self = shift; + my $args = shift; + my @ret = (); + my $runlevel = 5; + $runlevel = $args->{"runlevel"} if defined $args->{"runlevel"}; + + if ($args->{"custom"} || 0) { + return read_custom_services ($args); + } + + foreach my $name (@{Service->EnabledServices ($runlevel)}) { + my $s = { + "name" => $name + }; + $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); + push @ret, $s; + } + return \@ret; +} + +# Return the status of given service +# return value is the exit code of status function +BEGIN{$TYPEINFO{Get} = ["function", + "integer", "string" ]; +} +sub Get { + + my $self = shift; + my $name = shift; + + return Service->Status ($name); +} + +# Executes an action (e.g. "restart") with given service +# return value is map with "exit", "stdout" and "stderr" keys +BEGIN{$TYPEINFO{Execute} = ["function", + [ "map", "string", "any"], + [ "map", "string", "any"]]; +} +sub Execute { + + my $self = shift; + + my $args = shift; + my $name = $args->{"name"} || ""; + my $action = $args->{"action"} || ""; + + if ($args->{"custom"} || 0) { + return execute_custom_script ($name, $action); + } + else { + return Service->RunInitScriptOutput ($name, $action); + } +} +1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/library/types/src/Hostname.ycp new/yast2-2.19.0/library/types/src/Hostname.ycp --- old/yast2-2.18.28/library/types/src/Hostname.ycp 2009-06-24 16:50:27.000000000 +0200 +++ new/yast2-2.19.0/library/types/src/Hostname.ycp 2009-11-26 18:22:44.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Flags: Stable * - * $Id: Hostname.ycp 57655 2009-06-19 11:09:18Z jsrain $ + * $Id: Hostname.ycp 59810 2009-11-26 17:22:43Z kmachalkova $ */ { @@ -155,9 +155,11 @@ } else { - fqhostname = String::FirstChunk( hostname_data["stdout"]:"", "\n"); + fqhostname = hostname_data["stdout"]:""; } + fqhostname = String::FirstChunk( fqhostname, "\n"); + y2debug("Current FQDN: %1", fqhostname); return fqhostname; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/Makefile.am new/yast2-2.19.0/Makefile.am --- old/yast2-2.18.28/Makefile.am 2009-04-01 11:00:34.000000000 +0200 +++ new/yast2-2.19.0/Makefile.am 2009-09-04 19:16:56.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/scripts/yast2 new/yast2-2.19.0/scripts/yast2 --- old/yast2-2.18.28/scripts/yast2 2009-09-25 17:32:11.000000000 +0200 +++ new/yast2-2.19.0/scripts/yast2 2009-11-26 18:56:04.000000000 +0100 @@ -408,6 +408,11 @@ echo "Something is wrong with the YaST user interface." >&2 exit_code=1 # also skips y2base later fi + if [ -n "$DISPLAY" -a ! -t 0 ]; then + rpm -V yast2-core yast2-ncurses yast2-qt yast2-gtk >&2 + echo "Something is wrong with the YaST user interface, NCurses selected but no terminal available." >&2 + exit_code=1 # also skips y2base later + fi # quick hack: treat gtk like qt elif [ "$SELECTED_GUI" = "qt" -o "$SELECTED_GUI" = "gtk" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.28/VERSION new/yast2-2.19.0/VERSION --- old/yast2-2.18.28/VERSION 2009-10-26 16:53:08.000000000 +0100 +++ new/yast2-2.19.0/VERSION 2009-11-26 18:54:08.000000000 +0100 @@ -1 +1 @@ -2.18.28 +2.19.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org