October 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-pkg-bindings
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Mon Oct 6 16:06:34 CEST 2008. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-09-29 15:54:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-10-03 16:44:07.401940000 +0200 @@ -1,0 +2,23 @@ +Fri Oct 3 13:56:41 CEST 2008 - lslezak(a)suse.cz + +- fixed Pkg::PkgReset() - reset the status (instead of unselect) + (bnc#431565) +- service handling related fixes (bnc#427728) +- 2.17.17 + +------------------------------------------------------------------- +Thu Oct 2 12:50:39 CEST 2008 - lslezak(a)suse.cz + +- removed Pkg::ServicesSave(), Pkg::ServicesLoad() and + Pkg::ServicesReset() - the functionality has been moved to + Pkg::SourceSaveAll(), Pkg::SourceRestore() and + Pkg::SourceFinishAll(). The reason is to descrease the amount + exported functions and lower the required changes in YCP code. + +------------------------------------------------------------------- +Wed Oct 1 13:02:00 CEST 2008 - lslezak(a)suse.cz + +- fixed Pkg::ServiceRefresh() - search for the service URL and pass + it to libzypp + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pkg-bindings-2.17.16.tar.bz2 New: ---- yast2-pkg-bindings-2.17.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.r20545/_old 2008-10-06 16:04:07.000000000 +0200 +++ /var/tmp/diff_new_pack.r20545/_new 2008-10-06 16:04:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.16) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.17.16 +Version: 2.17.17 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.17.16.tar.bz2 +Source0: yast2-pkg-bindings-2.17.17.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools @@ -45,7 +45,7 @@ Ladislav Slez�k <lslezak(a)novell.com> %prep -%setup -n yast2-pkg-bindings-2.17.16 +%setup -n yast2-pkg-bindings-2.17.17 # build only documentation, ignore all other directories echo "doc" > SUBDIRS ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.r20545/_old 2008-10-06 16:04:07.000000000 +0200 +++ /var/tmp/diff_new_pack.r20545/_new 2008-10-06 16:04:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.17.16) +# spec file for package yast2-pkg-bindings (Version 2.17.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings -Version: 2.17.16 +Version: 2.17.17 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.17.16.tar.bz2 +Source0: yast2-pkg-bindings-2.17.17.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 5.10.0 @@ -47,7 +47,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.17.16 +%setup -n yast2-pkg-bindings-2.17.17 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -79,6 +79,20 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog +* Fri Oct 03 2008 lslezak(a)suse.cz +- fixed Pkg::PkgReset() - reset the status (instead of unselect) + (bnc#431565) +- service handling related fixes (bnc#427728) +- 2.17.17 +* Thu Oct 02 2008 lslezak(a)suse.cz +- removed Pkg::ServicesSave(), Pkg::ServicesLoad() and + Pkg::ServicesReset() - the functionality has been moved to + Pkg::SourceSaveAll(), Pkg::SourceRestore() and + Pkg::SourceFinishAll(). The reason is to descrease the amount + exported functions and lower the required changes in YCP code. +* Wed Oct 01 2008 lslezak(a)suse.cz +- fixed Pkg::ServiceRefresh() - search for the service URL and pass + it to libzypp * Mon Sep 29 2008 lslezak(a)suse.cz - do not autorefresh remote repositories when there is no network connection (affected calls Pkg::SourceLoad(), ++++++ yast2-pkg-bindings-2.17.16.tar.bz2 -> yast2-pkg-bindings-2.17.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/configure new/yast2-pkg-bindings-2.17.17/configure --- old/yast2-pkg-bindings-2.17.16/configure 2008-09-29 15:53:54.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/configure 2008-10-03 16:42:04.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-pkg-bindings 2.17.16. +# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.17. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.17.16' -PACKAGE_STRING='yast2-pkg-bindings 2.17.16' +PACKAGE_VERSION='2.17.17' +PACKAGE_STRING='yast2-pkg-bindings 2.17.17' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1453,7 +1453,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-pkg-bindings 2.17.16 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.17.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1524,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.16:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.17:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.17.16 +yast2-pkg-bindings configure 2.17.17 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1650,7 +1650,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-pkg-bindings $as_me 2.17.16, which was +It was created by yast2-pkg-bindings $as_me 2.17.17, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2471,7 +2471,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.17.16' + VERSION='2.17.17' cat >>confdefs.h <<_ACEOF @@ -2699,7 +2699,7 @@ -VERSION="2.17.16" +VERSION="2.17.17" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21700,7 +21700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.17.16, which was +This file was extended by yast2-pkg-bindings $as_me 2.17.17, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21753,7 +21753,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.17.16 +yast2-pkg-bindings config.status 2.17.17 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-pkg-bindings-2.17.16/configure.in new/yast2-pkg-bindings-2.17.17/configure.in --- old/yast2-pkg-bindings-2.17.16/configure.in 2008-09-29 15:53:41.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/configure.in 2008-10-03 16:41:50.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-pkg-bindings, 2.17.16, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.17.17, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.16" +VERSION="2.17.17" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/Package.cc new/yast2-pkg-bindings-2.17.17/src/Package.cc --- old/yast2-pkg-bindings-2.17.16/src/Package.cc 2008-09-25 17:51:25.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/Package.cc 2008-10-03 13:28:14.000000000 +0200 @@ -1799,46 +1799,28 @@ return YCPBoolean(ret); } -void ResetAll(const zypp::ResStatus::TransactByValue &level) +template <class T> +inline void ResetAllKind(zypp::ResPoolProxy &proxy, const zypp::ResStatus::TransactByValue &level) { - // access to the Pool of Selectables - zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); - - // unset all packages, patterns... - for_(it, selectablePool.byKindBegin<zypp::Package>(), - selectablePool.byKindEnd<zypp::Package>()) - { - zypp::ui::Selectable::Ptr s = (*it); - if (s) s->unset(level); - } - - for_(it, selectablePool.byKindBegin<zypp::Pattern>(), - selectablePool.byKindEnd<zypp::Pattern>()) + for_(it, proxy.byKindBegin<T>(), proxy.byKindEnd<T>()) { zypp::ui::Selectable::Ptr s = (*it); - if (s) s->unset(level); + if (s) s->theObj().status().resetTransact(level); } +} - for_(it, selectablePool.byKindBegin<zypp::Patch>(), - selectablePool.byKindEnd<zypp::Patch>()) - { - zypp::ui::Selectable::Ptr s = (*it); - if (s) s->unset(level); - } - for_(it, selectablePool.byKindBegin<zypp::Product>(), - selectablePool.byKindEnd<zypp::Product>()) - { - zypp::ui::Selectable::Ptr s = (*it); - if (s) s->unset(level); - } +void ResetAll(const zypp::ResStatus::TransactByValue &level) +{ + // access to the Pool of Selectables + zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); - for_(it, selectablePool.byKindBegin<zypp::SrcPackage>(), - selectablePool.byKindEnd<zypp::SrcPackage>()) - { - zypp::ui::Selectable::Ptr s = (*it); - if (s) s->unset(level); - } + // unset all packages, patterns... + ResetAllKind<zypp::Package>(selectablePool, level); + ResetAllKind<zypp::Pattern>(selectablePool, level); + ResetAllKind<zypp::Patch>(selectablePool, level); + ResetAllKind<zypp::Product>(selectablePool, level); + ResetAllKind<zypp::SrcPackage>(selectablePool, level); } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/PkgFunctions.h new/yast2-pkg-bindings-2.17.17/src/PkgFunctions.h --- old/yast2-pkg-bindings-2.17.16/src/PkgFunctions.h 2008-09-29 14:54:51.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/PkgFunctions.h 2008-10-02 12:33:23.000000000 +0200 @@ -787,14 +787,8 @@ YCPValue ServiceGet(const YCPString&); /* TYPEINFO: boolean(string,map<string,any>)*/ YCPValue ServiceSet(const YCPString&, const YCPMap&); - /* TYPEINFO: boolean()*/ - YCPValue ServicesSave(); - /* TYPEINFO: boolean()*/ - YCPValue ServicesLoad(); /* TYPEINFO: boolean(string)*/ YCPValue ServiceRefresh(const YCPString&); - /* TYPEINFO: void()*/ - YCPValue ServicesReset(); /* TYPEINFO: string(string)*/ YCPValue ServiceURL(const YCPString &alias); /* TYPEINFO: string(string)*/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/PkgService.cc new/yast2-pkg-bindings-2.17.17/src/PkgService.cc --- old/yast2-pkg-bindings-2.17.16/src/PkgService.cc 2008-08-22 13:27:45.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/PkgService.cc 2008-10-03 10:33:45.000000000 +0200 @@ -26,7 +26,7 @@ } PkgService::PkgService(const zypp::ServiceInfo &s, const std::string &old_alias) : - zypp::ServiceInfo(s), _deleted(false), _old_alias(old_alias.empty() ? s.alias() : old_alias) + zypp::ServiceInfo(s), _deleted(false), _old_alias(old_alias) { } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/Service.cc new/yast2-pkg-bindings-2.17.17/src/Service.cc --- old/yast2-pkg-bindings-2.17.16/src/Service.cc 2008-09-19 15:02:55.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/Service.cc 2008-10-02 17:57:23.000000000 +0200 @@ -74,8 +74,9 @@ return YCPBoolean(service_manager.AddService(alias->value(), url->value())); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -99,8 +100,9 @@ return YCPBoolean(service_manager.RemoveService(alias->value())); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -135,7 +137,7 @@ } /****************************************************************************** - * @builtin SourceURL + * @builtin ServiceURL * * @short Get full service URL (including password!) * @param alias alias of the service @@ -209,46 +211,9 @@ return YCPBoolean(service_manager.SetService(old_alias->value(), s)); } - catch(...) - { - } - - return YCPBoolean(false); -} - -/** - @builtin ServicesSave - @short Save the current service configuration to disk. - @return boolean false if failed -*/ -YCPValue PkgFunctions::ServicesSave() -{ - try - { - zypp::RepoManager repomanager = CreateRepoManager(); - return YCPBoolean(service_manager.SaveServices(repomanager)); - } - catch(...) - { - } - - return YCPBoolean(false); -} - -/** - @builtin ServicesLoad - @short Load service configurations from disk. If the services have alrady been loaded it does nothing. - @return boolean false if failed -*/ -YCPValue PkgFunctions::ServicesLoad() -{ - try - { - zypp::RepoManager repomanager = CreateRepoManager(); - return YCPBoolean(service_manager.LoadServices(repomanager)); - } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -273,24 +238,15 @@ zypp::RepoManager repomanager = CreateRepoManager(); return YCPBoolean(service_manager.RefreshService(alias->value(), repomanager)); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); } /** - @builtin ServicesReset - @short Reset the list of known services. All changes are lost. -*/ -YCPValue PkgFunctions::ServicesReset() -{ - service_manager.Reset(); - return YCPVoid(); -} - -/** @builtin ServiceProbe @short Probe service type at a URL @param url URL of the service @@ -309,8 +265,9 @@ const zypp::RepoManager repomanager = CreateRepoManager(); return YCPString(service_manager.Probe(zypp::Url(url->asString()->value()), repomanager)); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); return YCPVoid(); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/ServiceManager.cc new/yast2-pkg-bindings-2.17.17/src/ServiceManager.cc --- old/yast2-pkg-bindings-2.17.16/src/ServiceManager.cc 2008-09-19 14:12:19.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/ServiceManager.cc 2008-10-03 12:45:44.000000000 +0200 @@ -23,6 +23,7 @@ #include "ServiceManager.h" #include <zypp/RepoManager.h> +#include <y2util/Y2SLog.h> ServiceManager::ServiceManager() : _services_loaded(false) { @@ -32,99 +33,96 @@ { } -bool ServiceManager::LoadServices(const zypp::RepoManager &repomgr) +void ServiceManager::LoadServices(const zypp::RepoManager &repomgr) { - bool ret = true; - if (!_services_loaded) { - try + for_ (it, repomgr.serviceBegin(), repomgr.serviceEnd()) { - for_ (it, repomgr.serviceBegin(), repomgr.serviceEnd()) - { - // set the original alias to the current one - PkgService s(*it, it->alias()); - y2milestone("Loaded service %s (%s)", s.alias().c_str(), s.url().asString().c_str()); - _known_services.insert(std::make_pair(s.alias(), s)); - } - - _services_loaded = true; - } - catch(...) - { - ret = false; + // set the original alias to the current one + PkgService s(*it, it->alias()); + y2milestone("Loaded service %s (%s)", s.alias().c_str(), s.url().asString().c_str()); + _known_services.insert(std::make_pair(s.alias(), s)); } + + _services_loaded = true; } else { y2warning("Services have already been loaded, skipping load"); } - - return ret; } -bool ServiceManager::SaveServices(zypp::RepoManager &repomgr) const +void ServiceManager::SaveServices(zypp::RepoManager &repomgr) const { - bool ret = true; - for_ (it, _known_services.begin(), _known_services.end()) { - std::string alias(it->second.alias()); - - try - { - // delete - if (it->second.isDeleted()) - { - y2milestone("Removing service %s", alias.c_str()); - repomgr.removeService(alias); - } - } - catch(...) + // delete + if (it->second.isDeleted()) { - y2error("Cannot delete service %s", alias.c_str()); - ret = false; + std::string alias(it->second.alias()); + y2milestone("Removing service %s", alias.c_str()); + repomgr.removeService(alias); } } for_ (it, _known_services.begin(), _known_services.end()) { - std::string alias(it->second.alias()); - - try + if (!it->second.isDeleted()) { - // save - if (!it->second.isDeleted()) + const PkgService s_known = it->second; + const std::string alias(s_known.alias()); + const zypp::ServiceInfo s_stored = repomgr.getService(alias); + + DBG << "Known Service: " << it->second << std::endl; + DBG << "Stored Service: " << repomgr.getService(alias) << std::endl; + + bool modified = (s_stored.url() != s_known.url() + || s_stored.name() != s_known.name() + || s_stored.enabled() != s_known.enabled() + || s_stored.autorefresh() != s_known.autorefresh() + ); + + if (modified) { - if (it->second != repomgr.getService(alias)) + std::string orig_alias(s_known.origAlias()); + + y2internal("orig_alias: %s", orig_alias.c_str()); + + // the old alias is empty for new services + if (orig_alias.empty()) + { + y2milestone("Adding new service %s", alias.c_str()); + // add the service + repomgr.addService(s_known); + } + else { - y2milestone("Saving modified service %s", alias.c_str()); - // FIXME use old alias - repomgr.modifyService(alias, it->second); + y2milestone("Saving service %s", alias.c_str()); + // use the old alias + repomgr.modifyService(orig_alias, s_known); } } - } - catch(...) - { - y2error("Cannot save service %s", alias.c_str()); - ret = false; + else + { + y2milestone("Service %s has not been modified, not saving", alias.c_str()); + } } } - - return ret; } -bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const +bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) { - try - { - repomgr.refreshService(alias); - return true; - } - catch(...) + PkgServices::iterator serv_it = _known_services.find(alias); + + if (serv_it == _known_services.end()) { + y2error("Service '%s' does not exist", alias.c_str()); return false; } + + repomgr.refreshService(serv_it->second); + return true; } ServiceManager::Services ServiceManager::GetServices() const @@ -145,84 +143,69 @@ bool ServiceManager::AddService(const std::string &alias, const std::string &url) { - try + if (alias.empty()) { - if (alias.empty()) - { - y2error("Empty alias for service %s", url.c_str()); - return false; - } + y2error("Empty alias for service %s", url.c_str()); + return false; + } - PkgServices::iterator serv_it = _known_services.find(alias); - std::string orig_alias; + PkgServices::iterator serv_it = _known_services.find(alias); + std::string orig_alias; - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - // remember the original alias - // adding a removed service is the same as changing existing one - orig_alias = serv_it->second.alias(); - - // we are adding an already removed service, - // remove the existing service - _known_services.erase(serv_it); - } - else - { - y2error("Service with alias %s already exists", alias.c_str()); - return false; - } + // remember the original alias + // adding a removed service is the same as changing existing one + orig_alias = serv_it->second.alias(); + + // we are adding an already removed service, + // remove the existing service + _known_services.erase(serv_it); } + else + { + y2error("Service with alias %s already exists", alias.c_str()); + return false; + } + } - zypp::ServiceInfo info; - info.setAlias(alias); - info.setUrl(url); + zypp::ServiceInfo info; + info.setAlias(alias); + info.setUrl(url); - PkgService srv(info, orig_alias); + PkgService srv(info, orig_alias); + y2milestone("Adding service %s (orig alias: %s)", alias.c_str(), srv.origAlias().c_str()); - _known_services.insert(std::make_pair(alias, srv)); - } - catch(...) - { - return false; - } + _known_services.insert(std::make_pair(alias, srv)); return true; } bool ServiceManager::RemoveService(const std::string &alias) { - try - { - PkgServices::iterator serv_it = _known_services.find(alias); + PkgServices::iterator serv_it = _known_services.find(alias); - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - y2warning("Service %s has been already removed", alias.c_str()); - return true; - } - else - { - serv_it->second.setDeleted(); - y2milestone("Service %s has been marked as deleted", alias.c_str()); - return true; - } + y2warning("Service %s has been already removed", alias.c_str()); + return true; } else { - y2error("Service %s does not exist", alias.c_str()); - return false; + serv_it->second.setDeleted(); + y2milestone("Service %s has been marked as deleted", alias.c_str()); + return true; } } - catch(...) + else { + y2error("Service %s does not exist", alias.c_str()); return false; } - - return true; } void ServiceManager::Reset() @@ -236,74 +219,54 @@ zypp::ServiceInfo ServiceManager::GetService(const std::string &alias) const { - try - { - PkgServices::const_iterator serv_it = _known_services.find(alias); + PkgServices::const_iterator serv_it = _known_services.find(alias); - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - y2warning("Service %s has been removed", alias.c_str()); - return zypp::ServiceInfo::noService; - } - else - { - return serv_it->second; - } + y2warning("Service %s has been removed", alias.c_str()); + return zypp::ServiceInfo::noService; } else { - y2error("Service %s does not exist", alias.c_str()); - return zypp::ServiceInfo::noService; + return serv_it->second; } } - catch(...) + else { + y2error("Service %s does not exist", alias.c_str()); + return zypp::ServiceInfo::noService; } return zypp::ServiceInfo::noService; } -bool ServiceManager::SetService(const std::string old_alias, const zypp::ServiceInfo &srv) +bool ServiceManager::SetService(const std::string &old_alias, const zypp::ServiceInfo &srv) { - try - { - PkgServices::const_iterator serv_it = _known_services.find(old_alias); + PkgServices::const_iterator serv_it = _known_services.find(old_alias); - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - y2warning("Service %s has been removed", old_alias.c_str()); - return false; - } - else - { - // if the alias has been already changed then keep the original alias - if (old_alias == serv_it->second.alias() ) - { - PkgService s(srv, old_alias); - _known_services[srv.alias()] = s; - } - else - { - // keep the old alias - PkgService s(srv, serv_it->second.origAlias()); - _known_services[srv.alias()] = s; - } - - return true; - } + y2warning("Service %s has been removed", old_alias.c_str()); + return false; } else { - y2error("Service %s does not exist", old_alias.c_str()); - return false; + // if the alias has been already changed then keep the original alias + y2milestone("Setting service: %s (orig alias: %s)", old_alias.c_str(), serv_it->second.origAlias().c_str()); + DBG << "Properties: " << srv << std::endl; + PkgService s(srv, serv_it->second.origAlias()); + _known_services[srv.alias()] = s; + return true; } } - catch(...) + else { + y2error("Service %s does not exist", old_alias.c_str()); + return false; } return false; @@ -318,3 +281,14 @@ return ret; } +bool ServiceManager::empty() const +{ + return _known_services.empty(); +} + + +ServiceManager::Services::size_type ServiceManager::size() const +{ + return _known_services.size(); +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/ServiceManager.h new/yast2-pkg-bindings-2.17.17/src/ServiceManager.h --- old/yast2-pkg-bindings-2.17.16/src/ServiceManager.h 2008-09-19 14:06:58.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/ServiceManager.h 2008-10-03 10:21:22.000000000 +0200 @@ -40,9 +40,9 @@ Services GetServices() const; - bool LoadServices(const zypp::RepoManager &repomgr); + void LoadServices(const zypp::RepoManager &repomgr); - bool SaveServices(zypp::RepoManager &repomgr) const; + void SaveServices(zypp::RepoManager &repomgr) const; bool AddService(const std::string &alias, const std::string &url); @@ -50,14 +50,20 @@ zypp::ServiceInfo GetService(const std::string &alias) const; - bool SetService(const std::string old_alias, const zypp::ServiceInfo &srv); + bool SetService(const std::string &old_alias, const zypp::ServiceInfo &srv); - bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const; + bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr); std::string Probe(const zypp::Url &url, const zypp::RepoManager &repomgr) const; void Reset(); + // is there any service? (incl. deleted!) + bool empty() const; + + // number of services (incl. deleted!) + Services::size_type size() const; + private: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/Source_Get.cc new/yast2-pkg-bindings-2.17.17/src/Source_Get.cc --- old/yast2-pkg-bindings-2.17.16/src/Source_Get.cc 2008-09-25 08:57:07.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/Source_Get.cc 2008-10-01 18:39:49.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Get.cc 51491 2008-09-25 06:57:05Z lslezak $ + File: $Id: Source_Get.cc 51767 2008-10-01 16:39:48Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for reading repository properties Namespace: Pkg @@ -370,8 +370,10 @@ * source priority (highest first). A source state is a map: * $[ * "SrcId" : YCPInteger, - * "enabled" : YCPBoolean - * "autorefresh": YCPBoolean + * "enabled" : YCPBoolean, + * "autorefresh": YCPBoolean, + * "name" : YCPString, + * "service" : YCPString * ]; * * @return list<map> list of source states (map) @@ -395,6 +397,7 @@ src_map->add(YCPString("autorefresh"), YCPBoolean((*it)->repoInfo().autorefresh())); src_map->add(YCPString("name"), YCPString((*it)->repoInfo().name())); src_map->add(YCPString("priority"), YCPInteger((*it)->repoInfo().priority())); + src_map->add(YCPString("service"), YCPString((*it)->repoInfo().service())); ret->add(src_map); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/Source_Load.cc new/yast2-pkg-bindings-2.17.17/src/Source_Load.cc --- old/yast2-pkg-bindings-2.17.16/src/Source_Load.cc 2008-09-29 15:51:38.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/Source_Load.cc 2008-10-02 15:39:43.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Load.cc 51657 2008-09-29 13:51:36Z lslezak $ + File: $Id: Source_Load.cc 51795 2008-10-02 13:39:41Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for initializing the package manager Namespace: Pkg @@ -52,20 +52,74 @@ YCPValue PkgFunctions::SourceRestore() { + // return value + bool success = true; + if (repos.size() > 0) { y2warning("Number of registered repositories: %zd, skipping repository load!", repos.size()); - return YCPBoolean(true); + return YCPBoolean(success); } - bool success = true; - try { zypp::RepoManager repomanager = CreateRepoManager(); + + if (!service_manager.empty()) + { + y2warning("Number of known services: %zd, skipping service load!", service_manager.size()); + } + else + { + try + { + service_manager.LoadServices(repomanager); + + if (!service_manager.empty()) + { + // refresh services at first + ServiceManager::Services services(service_manager.GetServices()); + bool network_is_running = NetworkDetected(); + + for_(srv_it, services.begin(), services.end()) + { + try + { + if (srv_it->enabled() && srv_it->autorefresh()) + { + zypp::Url url(srv_it->url()); + + if (!network_is_running && remoteRepo(url)) + { + y2warning("No network connection, skipping autorefresh of remote service %s (%s)", + srv_it->alias().c_str(), url.asString().c_str()); + } + else + { + y2milestone("Autorefreshing service %s (%s)...", srv_it->alias().c_str(), url.asString().c_str()); + service_manager.RefreshService(srv_it->alias(), repomanager); + } + } + } + catch (const zypp::Exception& excpt) + { + // service refresh is not fatal, let's continue + y2error ("Error in service refresh: %s", excpt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(excpt)); + success = false; + } + } + } + } + catch (const zypp::Exception& excpt) + { + _last_error.setLastError(ExceptionAsString(excpt)); + success = false; + } + } + std::list<zypp::RepoInfo> reps = repomanager.knownRepositories(); - repos.clear(); for (std::list<zypp::RepoInfo>::iterator it = reps.begin(); it != reps.end(); ++it) { @@ -495,7 +549,7 @@ } /**************************************************************************************** - * @builtin SourceCleanupBroken + * @builtin SourceCleanupBroken - obsoleted, do not use! * * @short Clean up all sources that were not properly restored on the last * call of SourceStartManager or SourceStartCache. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/src/Source_Save.cc new/yast2-pkg-bindings-2.17.17/src/Source_Save.cc --- old/yast2-pkg-bindings-2.17.16/src/Source_Save.cc 2008-06-17 14:44:14.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/src/Source_Save.cc 2008-10-02 12:54:20.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Save.cc 48353 2008-06-17 12:44:13Z lslezak $ + File: $Id: Source_Save.cc 51780 2008-10-02 10:54:18Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for saving repository configuration Namespace: Pkg @@ -77,12 +77,27 @@ PkgFunctions::SourceSaveAll () { y2milestone("Saving the source setup..."); + bool ret = true; // nothing to save, return success - if (repos.size() == 0) + if (repos.empty() && service_manager.empty()) { - y2debug("No repository defined, saving skipped"); - return YCPBoolean(true); + y2debug("No repository or service defined, saving skipped"); + return YCPBoolean(ret); + } + + zypp::RepoManager repomanager = CreateRepoManager(); + + // save the services + try + { + service_manager.SaveServices(repomanager); + y2milestone("All services have been saved"); + } + catch (const zypp::Exception& excpt) + { + _last_error.setLastError(ExceptionAsString(excpt)); + ret = false; } // count removed repos @@ -125,8 +140,6 @@ // start the process pkgprogress.Start(_("Saving Repositories..."), stages, HelpTexts::save_help); - zypp::RepoManager repomanager = CreateRepoManager(); - // remove deleted repos (the old configurations) at first for (RepoCont::iterator it = repos.begin(); it != repos.end(); ++it) @@ -217,7 +230,7 @@ y2milestone("All sources have been saved"); - return YCPBoolean(true); + return YCPBoolean(ret); } /**************************************************************************************** @@ -246,6 +259,9 @@ // release all repositories repos.clear(); + + // release all services + service_manager.Reset(); } catch (zypp::Exception & excpt) { @@ -254,7 +270,7 @@ return YCPBoolean(false); } - y2milestone("All sources have been unregistered"); + y2milestone("All sources and services have been unregistered"); return YCPBoolean(true); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.16/VERSION new/yast2-pkg-bindings-2.17.17/VERSION --- old/yast2-pkg-bindings-2.17.16/VERSION 2008-09-29 15:53:27.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.17/VERSION 2008-10-03 16:40:37.000000000 +0200 @@ -1 +1 @@ -2.17.16 +2.17.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit branding-upstream
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package branding-upstream checked in at Mon Oct 6 16:02:26 CEST 2008. -------- --- branding-upstream/branding-upstream.changes 2008-09-17 17:51:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-upstream/branding-upstream.changes 2008-10-06 15:49:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 6 15:49:44 CEST 2008 - sbrabec(a)suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.g16117/_old 2008-10-06 16:02:15.000000000 +0200 +++ /var/tmp/diff_new_pack.g16117/_new 2008-10-06 16:02:15.000000000 +0200 @@ -20,9 +20,11 @@ Name: branding-upstream Version: 11.1 -Release: 1 +Release: 2 License: X11/MIT Group: System/Fhs +Provides: branding +Conflicts: otherproviders(branding) Source: %{name}-COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -63,5 +65,7 @@ %{_sysconfdir}/SuSE-brand %changelog +* Mon Oct 06 2008 sbrabec(a)suse.cz +- Conflict with other branding providers (FATE#304881). * Wed Sep 17 2008 sbrabec(a)suse.cz - New SuSE package (bnc#425390). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-nfs-server
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-nfs-server checked in at Mon Oct 6 16:02:18 CEST 2008. -------- --- yast2-nfs-server/yast2-nfs-server.changes 2008-07-23 19:06:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-nfs-server/yast2-nfs-server.changes 2008-10-02 11:10:04.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Oct 2 11:09:47 CEST 2008 - mvidner(a)suse.cz + +- Use rpcbind by default and fall back to portmap (bnc#423026). +- 2.17.1 + +------------------------------------------------------------------- +Mon Sep 8 13:48:46 CEST 2008 - mvidner(a)suse.cz + +- Applied proofreading changes from Andrew Spackman. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-nfs-server-2.17.0.tar.bz2 New: ---- yast2-nfs-server-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-server.spec ++++++ --- /var/tmp/diff_new_pack.F15941/_old 2008-10-06 16:02:12.000000000 +0200 +++ /var/tmp/diff_new_pack.F15941/_new 2008-10-06 16:02:12.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-nfs-server (Version 2.17.0) +# spec file for package yast2-nfs-server (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,15 +19,16 @@ Name: yast2-nfs-server -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nfs-server-2.17.0.tar.bz2 +Source0: yast2-nfs-server-2.17.1.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 >= 2.11.11 +# Service::Find +Requires: yast2 >= 2.17.28 Requires: yast2-nfs-common Provides: yast2-config-nfs-server yast2-config-nfs-server-devel Obsoletes: yast2-config-nfs-server yast2-config-nfs-server-devel @@ -62,7 +70,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-nfs-server-2.17.0 +%setup -n yast2-nfs-server-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +114,11 @@ /usr/share/YaST2/scrconf/etc_idmapd_conf.scr /usr/lib/YaST2/servers_non_y2/ag_idmapd_conf %changelog +* Thu Oct 02 2008 mvidner(a)suse.cz +- Use rpcbind by default and fall back to portmap (bnc#423026). +- 2.17.1 +* Mon Sep 08 2008 mvidner(a)suse.cz +- Applied proofreading changes from Andrew Spackman. * Wed Jul 23 2008 mvidner(a)suse.cz - Help text: clarified that "*" works only in host names, not network IPs (bnc#405207). ++++++ yast2-nfs-server-2.17.0.tar.bz2 -> yast2-nfs-server-2.17.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/configure new/yast2-nfs-server-2.17.1/configure --- old/yast2-nfs-server-2.17.0/configure 2008-07-23 19:06:44.000000000 +0200 +++ new/yast2-nfs-server-2.17.1/configure 2008-10-02 11:12:05.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-nfs-server 2.17.0. +# Generated by GNU Autoconf 2.61 for yast2-nfs-server 2.17.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nfs-server' PACKAGE_TARNAME='yast2-nfs-server' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='yast2-nfs-server 2.17.0' +PACKAGE_VERSION='2.17.1' +PACKAGE_STRING='yast2-nfs-server 2.17.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1199,7 +1199,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-nfs-server 2.17.0 to adapt to many kinds of systems. +\`configure' configures yast2-nfs-server 2.17.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-nfs-server 2.17.0:";; + short | recursive ) echo "Configuration of yast2-nfs-server 2.17.1:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-nfs-server configure 2.17.0 +yast2-nfs-server configure 2.17.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1362,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-nfs-server $as_me 2.17.0, which was +It was created by yast2-nfs-server $as_me 2.17.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='yast2-nfs-server' - VERSION='2.17.0' + VERSION='2.17.1' cat >>confdefs.h <<_ACEOF @@ -2411,7 +2411,7 @@ -VERSION="2.17.0" +VERSION="2.17.1" RPMNAME="yast2-nfs-server" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -3399,7 +3399,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-nfs-server $as_me 2.17.0, which was +This file was extended by yast2-nfs-server $as_me 2.17.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3442,7 +3442,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-nfs-server config.status 2.17.0 +yast2-nfs-server config.status 2.17.1 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-nfs-server-2.17.0/configure.in new/yast2-nfs-server-2.17.1/configure.in --- old/yast2-nfs-server-2.17.0/configure.in 2008-07-23 19:06:35.000000000 +0200 +++ new/yast2-nfs-server-2.17.1/configure.in 2008-10-02 11:12:02.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-nfs-server dnl -dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-server, 2.17.0, http://bugs.opensuse.org/, yast2-nfs-server) +AC_INIT(yast2-nfs-server, 2.17.1, http://bugs.opensuse.org/, yast2-nfs-server) 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.0" +VERSION="2.17.1" RPMNAME="yast2-nfs-server" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/src/NfsServer.ycp new/yast2-nfs-server-2.17.1/src/NfsServer.ycp --- old/yast2-nfs-server-2.17.0/src/NfsServer.ycp 2008-04-16 10:53:46.000000000 +0200 +++ new/yast2-nfs-server-2.17.1/src/NfsServer.ycp 2008-10-02 11:10:06.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: NfsServer.ycp 46699 2008-04-16 08:53:46Z mvidner $ + * $Id: NfsServer.ycp 51773 2008-10-02 09:10:04Z mvidner $ * */ @@ -214,6 +214,24 @@ return true; } + + string portmapper = nil; + + /** + * Get the used port mapper: since SLE11A3 we have rpcbind + * instead of portmap as the default (bnc#423026) + */ + string Portmapper() { + if (portmapper == nil) { + portmapper = Service::Find(["rpcbind", "portmap"]); + if (portmapper == "") { + y2error("No portmapper found"); + portmapper = "rpcbind"; + } + } + return portmapper; + } + /** * Saves NFS server configuration. (exports(5)) * Creates any missing directories. @@ -302,7 +320,7 @@ } else { - if (! Service::Enable("portmap")) + if (! Service::Enable(Portmapper ())) { Report::Error (Service::Error()); ok = false; @@ -359,7 +377,7 @@ if (! Service::Start("svcgssd")) { // FIXME svcgssd is gone! (only nfsserver is left) - Report::Error(_("Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is fine.")); + Report::Error(_("Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is correct.")); ok = false; } } @@ -387,10 +405,10 @@ if (!write_only) { - if (Service::Status("portmap") != 0 ) + if (Service::Status(Portmapper ()) != 0 ) { // portmap must not be started if it is running already (see bug # 9999) - Service::Start("portmap"); + Service::Start(Portmapper ()); } Service::Stop("nfsserver"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite2.out new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite2.out --- old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite2.out 2008-01-02 13:24:34.000000000 +0100 +++ new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite2.out 2008-10-02 11:06:22.000000000 +0200 @@ -2,13 +2,13 @@ Dump Read - services are running Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -30,16 +30,16 @@ Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -r /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfslock" true Execute .target.bash "/etc/init.d/nfslock stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -47,7 +47,7 @@ Dump Read - services are running Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil @@ -66,30 +66,31 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfslock" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true @@ -105,7 +106,7 @@ Dump Read - services are stopped Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil @@ -129,15 +130,15 @@ Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfslock" true Execute .target.bash "/etc/init.d/nfslock stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -145,7 +146,7 @@ Dump Read - services are stopped Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil @@ -164,23 +165,23 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]] -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/portmap" $["exit":0, "stderr":"", "stdout":""] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]] +Execute .target.bash_output "/sbin/insserv -d /etc/init.d/rpcbind" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfslock" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 @@ -188,8 +189,8 @@ Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite2.ycp new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite2.ycp --- old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite2.ycp 2005-05-18 16:25:37.000000000 +0200 +++ new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite2.ycp 2008-10-02 11:10:06.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite2.ycp 19333 2004-09-14 07:23:41Z jsrain $ + * $Id: readwrite2.ycp 51773 2008-10-02 09:10:04Z mvidner $ */ { // testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp @@ -54,12 +54,12 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": service_on, + "rpcbind": service_on, "nfsserver": service_on, ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "nfsserver": $[], ], ], @@ -87,9 +87,9 @@ map READ2 = READ; READ2["init","scripts","exists"] = false; - // services portmap & nfsserver are stopped + // services rpcbind & nfsserver are stopped map READ3 = READ; - READ3["init","scripts","runlevel","portmap"] = service_off; + READ3["init","scripts","runlevel","rpcbind"] = service_off; READ3["init","scripts","runlevel","nfsserver"] = service_off; map WRITE = $[ @@ -113,7 +113,7 @@ ], ]; - // nfsserver and portmap are running + // nfsserver and rpcbind are running DUMP ("\nRead - services are running\n"); TEST (``(NfsServer::Read ()), [READ, WRITE, EXECUTE], nil); DUMP ("\nWrite - services will be stopped\n"); @@ -122,7 +122,7 @@ // And Write TEST (``(NfsServer::Write ()), [READ, WRITE, EXECUTE], nil); - // nfsserver and portmap are running + // nfsserver and rpcbind are running DUMP ("\nRead - services are running\n"); TEST (``(NfsServer::Read ()), [READ, WRITE, EXECUTE], nil); DUMP ("\nWrite - services are running\n"); @@ -131,7 +131,7 @@ // And Write TEST (``(NfsServer::Write ()), [READ, WRITE, EXECUTE], nil); - // nfsserver and portmap are stopped + // nfsserver and rpcbind are stopped DUMP ("\nRead - services are stopped\n"); TEST (``(NfsServer::Read ()), [READ3, WRITE, EXECUTE], nil); DUMP ("\nWrite - services will be stopped\n"); @@ -140,7 +140,7 @@ // And Write TEST (``(NfsServer::Write ()), [READ3, WRITE, EXECUTE], nil); - // nfsserver and portmap are stopped + // nfsserver and rpcbind are stopped DUMP ("\nRead - services are stopped\n"); TEST (``(NfsServer::Read ()), [READ3, WRITE, EXECUTE], nil); DUMP ("\nWrite - services will be started\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite.out new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite.out --- old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite.out 2008-01-02 13:24:34.000000000 +0100 +++ new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite.out 2008-10-02 11:01:59.000000000 +0200 @@ -1,12 +1,12 @@ Dump Read Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -21,29 +21,30 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["nfslock":$[], "nfsserver":$[], "portmap":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfslock" $["nfslock":$[], "nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfslock" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfslock":$[], "nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite-unfsd.out new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite-unfsd.out --- old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite-unfsd.out 2008-01-02 13:24:34.000000000 +0100 +++ new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite-unfsd.out 2008-10-02 11:01:51.000000000 +0200 @@ -1,12 +1,12 @@ Dump Read Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" false Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -21,24 +21,25 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite-unfsd.ycp new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite-unfsd.ycp --- old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite-unfsd.ycp 2006-01-05 10:27:15.000000000 +0100 +++ new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite-unfsd.ycp 2008-10-02 11:10:06.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite-unfsd.ycp 26805 2006-01-05 09:27:15Z mvidner $ + * $Id: readwrite-unfsd.ycp 51773 2008-10-02 09:10:04Z mvidner $ */ { // testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp @@ -53,14 +53,14 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": service_on, + "rpcbind": service_on, "nfsserver": service_on, "network": service_on, "networkmanager": service_off, ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "nfsserver": $[], ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite.ycp new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite.ycp --- old/yast2-nfs-server-2.17.0/testsuite/tests/readwrite.ycp 2005-05-18 16:25:37.000000000 +0200 +++ new/yast2-nfs-server-2.17.1/testsuite/tests/readwrite.ycp 2008-10-02 11:10:06.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite.ycp 19333 2004-09-14 07:23:41Z jsrain $ + * $Id: readwrite.ycp 51773 2008-10-02 09:10:04Z mvidner $ */ { // testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp @@ -53,13 +53,13 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": service_on, + "rpcbind": service_on, "nfsserver": service_on, "nfslock": service_on, ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "nfsserver": $[], "nfslock": $[], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.17.0/VERSION new/yast2-nfs-server-2.17.1/VERSION --- old/yast2-nfs-server-2.17.0/VERSION 2008-07-23 19:04:17.000000000 +0200 +++ new/yast2-nfs-server-2.17.1/VERSION 2008-10-02 11:01:36.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-network checked in at Mon Oct 6 16:02:03 CEST 2008. -------- --- yast2-network/yast2-network.changes 2008-09-25 19:53:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-10-06 15:01:43.000000000 +0200 @@ -1,0 +2,37 @@ +Mon Oct 6 14:08:39 CEST 2008 - mzugec(a)suse.de + +- added support for HSI (s390) devices (fate#304938) +- 2.17.37 + +------------------------------------------------------------------- +Mon Oct 6 13:26:49 CEST 2008 - visnov(a)suse.cz + +- adapt to new Confirm::Detection API (bnc #431276) + +------------------------------------------------------------------- +Sat Oct 4 11:25:21 CEST 2008 - mzugec(a)suse.de + +- adapt yast to configure network devices on s390 using udev + (fate#304938) +- 2.17.36 + +------------------------------------------------------------------- +Thu Oct 2 21:21:38 CEST 2008 - mzugec(a)suse.de + +- check NM plugin after network is up (bnc#427374) +- 2.17.35 + +------------------------------------------------------------------- +Wed Oct 1 15:57:16 CEST 2008 - mzugec(a)suse.de + +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.34 + +------------------------------------------------------------------- +Wed Oct 1 14:13:17 CEST 2008 - mzugec(a)suse.de + +- use Service::Restart instead of bash agent +- don't restart network twice in Lan::Write() +- 2.17.33 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.17.32.tar.bz2 New: ---- yast2-network-2.17.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.U14381/_old 2008-10-06 16:01:34.000000000 +0200 +++ /var/tmp/diff_new_pack.U14381/_new 2008-10-06 16:01:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.17.32) +# spec file for package yast2-network (Version 2.17.37) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-network -Version: 2.17.32 +Version: 2.17.37 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.17.32.tar.bz2 +Source0: yast2-network-2.17.37.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -79,7 +79,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.17.32 +%setup -n yast2-network-2.17.37 %build %{prefix}/bin/y2tool y2autoconf @@ -143,6 +143,25 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Mon Oct 06 2008 mzugec(a)suse.de +- added support for HSI (s390) devices (fate#304938) +- 2.17.37 +* Mon Oct 06 2008 visnov(a)suse.cz +- adapt to new Confirm::Detection API (bnc #431276) +* Sat Oct 04 2008 mzugec(a)suse.de +- adapt yast to configure network devices on s390 using udev + (fate#304938) +- 2.17.36 +* Thu Oct 02 2008 mzugec(a)suse.de +- check NM plugin after network is up (bnc#427374) +- 2.17.35 +* Wed Oct 01 2008 mzugec(a)suse.de +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.34 +* Wed Oct 01 2008 mzugec(a)suse.de +- use Service::Restart instead of bash agent +- don't restart network twice in Lan::Write() +- 2.17.33 * Thu Sep 25 2008 mzugec(a)suse.de - copy udev files for s390 (bnc#422150) - 2.17.32 ++++++ yast2-network-2.17.32.tar.bz2 -> yast2-network-2.17.37.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/configure new/yast2-network-2.17.37/configure --- old/yast2-network-2.17.32/configure 2008-09-23 01:48:55.000000000 +0200 +++ new/yast2-network-2.17.37/configure 2008-10-06 14:33:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-network 2.17.31. +# Generated by GNU Autoconf 2.63 for yast2-network 2.17.37. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.17.31' -PACKAGE_STRING='yast2-network 2.17.31' +PACKAGE_VERSION='2.17.37' +PACKAGE_STRING='yast2-network 2.17.37' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-network 2.17.31 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.17.37 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.17.31:";; + short | recursive ) echo "Configuration of yast2-network 2.17.37:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.17.31 +yast2-network configure 2.17.37 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,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-network $as_me 2.17.31, which was +It was created by yast2-network $as_me 2.17.37, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.17.31' + VERSION='2.17.37' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.17.31" +VERSION="2.17.37" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3451,7 +3451,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.17.31, which was +This file was extended by yast2-network $as_me 2.17.37, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-network config.status 2.17.31 +yast2-network config.status 2.17.37 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/configure.in new/yast2-network-2.17.37/configure.in --- old/yast2-network-2.17.32/configure.in 2008-09-23 01:48:44.000000000 +0200 +++ new/yast2-network-2.17.37/configure.in 2008-10-06 14:33:29.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.17.31, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.17.37, http://bugs.opensuse.org/, yast2-network) 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.31" +VERSION="2.17.37" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/clients/save_network.ycp new/yast2-network-2.17.37/src/clients/save_network.ycp --- old/yast2-network-2.17.32/src/clients/save_network.ycp 2008-09-25 19:23:56.000000000 +0200 +++ new/yast2-network-2.17.37/src/clients/save_network.ycp 2008-10-01 15:50:25.000000000 +0200 @@ -444,7 +444,7 @@ // if portmap running - start it after reboot WFM::Execute (.local.bash, - "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + "pidofproc rpcbind && touch /var/lib/YaST2/network_install_rpcbind"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/lan/hardware.ycp new/yast2-network-2.17.37/src/lan/hardware.ycp --- old/yast2-network-2.17.32/src/lan/hardware.ycp 2008-09-09 15:31:38.000000000 +0200 +++ new/yast2-network-2.17.37/src/lan/hardware.ycp 2008-10-06 14:08:58.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: hardware.ycp 50797 2008-09-08 11:45:04Z mzugec $ + * $Id: hardware.ycp 51863 2008-10-06 12:08:57Z mzugec $ */ { @@ -164,7 +164,7 @@ /* Text entry label */ `ComboBox(`id(`modul), `opt(`editable), _("&Module Name"), hardware["modules_from_hwinfo"]:[]), `HSpacing(0.2), - `TextEntry(`id(`options), Label::Options (), hardware["options"]:"") + `InputField(`id(`options), `opt(`hstretch), Label::Options (), hardware["options"]:"") ), `VSpacing(0.4), CheckBoxes, @@ -202,7 +202,7 @@ // TODO: Ud ... Rules `Frame(_("Udev rules"), `HBox( - `TextEntry(`id(`device_name), _("Device Name"), ""), + `InputField(`id(`device_name), `opt(`hstretch), _("Device Name"), ""), `PushButton(`id(`change_udev), _("Change")) ) ); @@ -269,7 +269,7 @@ `ReplacePoint(`id(`rp), `SelectionBox(`id(`cards), _("&Network Card"), cards)), `VSpacing(0.5), /* Text entry field */ - `TextEntry(`id(`search), `opt(`notify), _("&Search")), + `InputField(`id(`search), `opt(`hstretch, `notify), _("&Search")), `VSpacing(0.5) ); @@ -525,6 +525,8 @@ */ define any S390Dialog() { + // already configured device (on hardware layer), skip this dialog + if (size(LanItems::Items[LanItems::current, "hwinfo", "dev_name"]:"")>0) return `next; ScreenName("lan-hardware-s390"); /* S/390 dialog caption */ @@ -535,17 +537,25 @@ string helptext = ""; term contents = `Empty (); - if(LanItems::type == "qeth") { + + if(LanItems::type == "qeth" || LanItems::type == "hsi") { + // CHANIDS + list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); + map<string, any> chanids_map = $[ + "read" : tmp_list[0]:"", + "write" : tmp_list[1]:"", + "control" : tmp_list[2]:"" + ]; contents = `HBox( `HSpacing(6), /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`chan_mode), _("&Port Name"), LanItems::chan_mode), + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode), `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`qeth_options), Label::Options (), LanItems::qeth_options), + `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), `VSpacing(1), /* CheckBox label */ `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), @@ -553,8 +563,14 @@ /* CheckBox label */ `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), /* TextEntry label */ - `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), - `VSpacing(1) + `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), + `VSpacing(1), +// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"), LanItems::qeth_chanids) + `HBox( + `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), + `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:""), + `InputField(`id(`qeth_chan_control), `opt(`hstretch), _("Control Channel"), chanids_map["control"]:"") + ) ), `HSpacing(2))), `HSpacing(6) ); @@ -567,32 +583,28 @@ _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); } +/* if(LanItems::type == "hsi") { contents = `HBox( `HSpacing(6), - /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), - /* TextEntry label */ - `TextEntry(`id(`qeth_options), Label::Options (), LanItems::qeth_options), + `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), `VSpacing(1), - /* CheckBox label */ `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), `VSpacing(1), - /* CheckBox label */ `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), - /* TextEntry label */ - `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), + `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), `VSpacing(1) ), `HSpacing(2))), `HSpacing(6) ); - /* S/390 dialog help: QETH */ helptext = _("Enter any additional Options for this interface (separated by spaces).") + _("Select Enable IPA Takeover if IP address takeover should be enabled for this interface.") + _("Select Enable Layer 2 Support if this card has been configured with layer 2 support.") + _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); } +*/ if(drvtype == "lcs") { contents = `HBox( @@ -601,10 +613,10 @@ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`chan_mode), _("&Port Number"), LanItems::chan_mode), + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Number"), LanItems::chan_mode), `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`lcs_timeout), _("&LANCMD Time-Out"), LanItems::lcs_timeout) + `InputField(`id(`lcs_timeout), `opt(`hstretch), _("&LANCMD Time-Out"), LanItems::lcs_timeout) ), `HSpacing(2))), `HSpacing(6) ); @@ -625,6 +637,11 @@ ]; if(drvtype == "ctc") { + list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); + map<string, any> chanids_map = $[ + "read" : tmp_list[0]:"", + "write" : tmp_list[1]:"", + ]; contents = `HBox( `HSpacing(6), /* Frame label */ @@ -632,7 +649,11 @@ `VSpacing(1), /* TextEntry label */ `ComboBox(`id(`chan_mode), _("&Protocol"), ctcitems), - `VSpacing(1) + `VSpacing(1), + `HBox( + `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), + `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:"") + ) ), `HSpacing(2))), `HSpacing(6) ); @@ -647,7 +668,7 @@ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label, #42789 */ - `TextEntry(`id(`chan_mode), _("&Peer Name"), ""), + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Peer Name"), ""), `VSpacing(1) ), `HSpacing(2))), `HSpacing(6) @@ -702,25 +723,14 @@ break; } else if(ret == `next) { - break; - } - else if(ret == `qeth_layer2) { - continue; - } - else { - y2error("Unexpected return code: %1", ret); - continue; - } - } - - if(ret == `next) { if(LanItems::type == "iucv") { // #176330, must be static LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } - else if (LanItems::type != "hsi") - LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); +// if (LanItems::type != "hsi") + LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); + if(LanItems::type == "lcs") LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); if(LanItems::type == "qeth" || LanItems::type == "hsi") { @@ -729,7 +739,25 @@ LanItems::qeth_layer2 = (boolean) UI::QueryWidget(`id(`qeth_layer2), `Value); LanItems::qeth_macaddress = (string) UI::QueryWidget(`id(`qeth_macaddress), `Value); } - + string read = (string) UI::QueryWidget(`id(`qeth_chan_read), `Value); + string write = (string) UI::QueryWidget(`id(`qeth_chan_write), `Value); + string control = (string) UI::QueryWidget(`id(`qeth_chan_control), `Value); + if (control==nil) control=""; + LanItems::qeth_chanids = String::CutBlanks( sformat("%1 %2 %3", read, write, control) ); + if (!LanItems::createS390Device()){ + Popup::Error(_("An error occured while creating device.\nSee YaST log for details.")); + ret=nil; + continue; + }; + break; + } + else if(ret == `qeth_layer2) { + continue; + } + else { + y2error("Unexpected return code: %1", ret); + continue; + } } return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/lan/wizards.ycp new/yast2-network-2.17.37/src/lan/wizards.ycp --- old/yast2-network-2.17.32/src/lan/wizards.ycp 2008-08-12 13:42:04.000000000 +0200 +++ new/yast2-network-2.17.37/src/lan/wizards.ycp 2008-10-02 16:11:52.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network cards configuration wizards * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: wizards.ycp 41587 2007-10-26 10:39:49Z mzugec $ + * $Id: wizards.ycp 51843 2008-10-04 09:36:36Z mzugec $ */ { @@ -155,7 +155,8 @@ if(action == "add") ws_start = "hardware"; /* All S/390 network devices */ - if(Arch::s390 () && LanItems::operation == `add) { +// if(Arch::s390 () && LanItems::operation == `add) { + if(Arch::s390 () ) { ws_start = "s390"; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/modules/DSL.ycp new/yast2-network-2.17.37/src/modules/DSL.ycp --- old/yast2-network-2.17.32/src/modules/DSL.ycp 2008-08-12 13:42:03.000000000 +0200 +++ new/yast2-network-2.17.37/src/modules/DSL.ycp 2008-10-06 14:06:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: DSL data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: DSL.ycp 46109 2008-04-04 14:02:03Z mzugec $ + * $Id: DSL.ycp 51856 2008-10-06 11:27:23Z visnov $ * * Representation of the configuration of DSL. * Input and output routines. @@ -201,7 +201,7 @@ sleep(sl); // Confirmation: label text (detecting hardware: xxx) - if (Confirm::Detection (_("PPPoE DSL Devices"))) + if (Confirm::Detection (_("PPPoE DSL Devices"), "yast-dsl")) { // it doesn't do anything except looking whether probe.pppoe is empty // FIXME: HW diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/modules/LanItems.ycp new/yast2-network-2.17.37/src/modules/LanItems.ycp --- old/yast2-network-2.17.32/src/modules/LanItems.ycp 2008-09-22 13:53:59.000000000 +0200 +++ new/yast2-network-2.17.37/src/modules/LanItems.ycp 2008-10-02 16:15:43.000000000 +0200 @@ -127,6 +127,7 @@ // MAC address handling for IPv4 with the layer2 option global boolean qeth_layer2 = false; global string qeth_macaddress = "00:00:00:00:00:00"; +global string qeth_chanids = ""; // Timeout for LCS LANCMD global string lcs_timeout = "5"; @@ -552,7 +553,7 @@ rich = " " + conn + " " + mac_dev; rich = HTML::Bold ( descr ) + rich; - if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0) + if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390()) rich = rich + _("Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."); else if (hasAnyValue(Items[key, "ifcfg"]:"") ) rich = rich + HTML::List (bullets); else { @@ -1577,8 +1578,66 @@ global boolean enableCurrentEditButton(){ if (needFirmwareCurrentItem()) return true; + if (Arch::s390()) return true; if (!hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) return false; else return true; } +global boolean createS390Device(){ + y2milestone("creating device s390 network device"); + boolean result=true; + // command to create device + string command1=""; + // command to find created device + string command2=""; + switch(type){ + case "qeth": + case "hsi": + if (size(chan_mode)>0) + // chan_ids (read, write, control), port + command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids); + else + command1=sformat("qeth_configure %1 1", qeth_chanids); + command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + break; + case "ctc": + // chan_ids (read, write), protocol + command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); + command2=sformat("ls /sys/devices/cu3088/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + break; + case "iucv": + // router + command1=sformat("iucv_configure %1", chan_mode); + command2=sformat("ls /sys/devices/%1/*/net/|head -n1|tr -d '\n'", type); + break; + default: + y2error("Unsupported type : %1", type); + } + y2milestone("execute %1", command1); + map<string, any> output1=(map<string, any>) SCR::Execute(.target.bash_output, command1); + if (output1["exit"]:-1==0 && size(output1["stderr"]:"")==0) y2milestone("Success : %1", output1); + else{ + y2error("Problem occured : %1", output1); + result=false; + } + y2milestone("output1 %1", output1); + + + if (result){ + y2milestone("command2 %1", command2); + map<string, any> output2=(map<string, any>) SCR::Execute(.target.bash_output, command2); + y2milestone("output2 %1", output2); + if (output2["exit"]:-1==0 && size(output2["stderr"]:"")==0){ + Items[current, "ifcfg"] = output2["stdout"]:""; + Items[current, "hwinfo", "dev_name"] = output2["stdout"]:""; + y2milestone("Device %1 created", output2["stdout"]:""); + }else{ + y2error("Some problem occured : %1", output2); + result=false; + } + } + + return result; +} + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/modules/Lan.ycp new/yast2-network-2.17.37/src/modules/Lan.ycp --- old/yast2-network-2.17.32/src/modules/Lan.ycp 2008-09-19 14:44:37.000000000 +0200 +++ new/yast2-network-2.17.37/src/modules/Lan.ycp 2008-10-02 16:11:52.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 51318 2008-09-19 12:44:36Z mzugec $ + * $Id: Lan.ycp 51805 2008-10-02 19:21:13Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -326,7 +326,7 @@ global define boolean Write() { y2milestone("Writing configuration"); - if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); +// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!LanItems::modified) { @@ -403,10 +403,6 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); - // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) - if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); - else NetworkService::StartStop (); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup DNS::Write(); @@ -438,7 +434,13 @@ /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); // NetworkModules::HwUp (); - NetworkService::StartStop (); + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) Service::Restart("network"); + else if(Service::Status("network")==0){ + Service::Reload("network"); + } else Service::Restart("network"); +// NetworkService::StartStop (); sleep(sl); } @@ -464,12 +466,6 @@ sleep(sl); } - if(!CheckNetworkManagerPlugin()) return false; - /* Final progress step */ - ProgressNextStage(_("Finished")); - sleep(sl); - - if(Abort()) return false; if (NetworkService::IsManaged()) { boolean network=false; @@ -486,6 +482,12 @@ } if (!network) Popup::Error(_("No network running")); } + if(!CheckNetworkManagerPlugin()) return false; + /* Final progress step */ + ProgressNextStage(_("Finished")); + sleep(sl); + + if(Abort()) return false; return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/routines/routines.ycp new/yast2-network-2.17.37/src/routines/routines.ycp --- old/yast2-network-2.17.32/src/routines/routines.ycp 2008-09-22 14:01:01.000000000 +0200 +++ new/yast2-network-2.17.37/src/routines/routines.ycp 2008-10-06 14:06:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscellaneous routines * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: routines.ycp 50748 2008-09-05 12:35:08Z mzugec $ + * $Id: routines.ycp 51856 2008-10-06 11:27:23Z visnov $ */ { @@ -601,7 +601,7 @@ /* Confirmation: label text (detecting hardware: xxx) */ string hwstring = _("All Network Devices"); if(haskey(hwstrings, hwtype)) hwstring = hwstrings[hwtype]:""; - if(!Confirm::Detection(hwstring)) return []; + if(!Confirm::Detection(hwstring, "yast-lan")) return []; /* read the corresponding hardware */ if(haskey(hwtypes, hwtype)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/VERSION new/yast2-network-2.17.37/VERSION --- old/yast2-network-2.17.32/VERSION 2008-09-23 01:56:57.000000000 +0200 +++ new/yast2-network-2.17.37/VERSION 2008-10-02 17:16:30.000000000 +0200 @@ -1 +1 @@ -2.17.32 +2.17.37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-mail
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-mail checked in at Mon Oct 6 16:01:24 CEST 2008. -------- --- yast2-mail/yast2-mail.changes 2008-09-28 10:48:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2008-10-06 13:41:47.330113000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 6 12:17:22 CEST 2008 - varkoly(a)suse.de + +- (bnc#432405) - typo in mail.pot + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.C12800/_old 2008-10-06 16:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.C12800/_new 2008-10-06 16:00:43.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-mail Version: 2.16.9 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -171,6 +171,8 @@ %dir /usr/share/YaST2/clients /usr/share/YaST2/clients/users* %changelog +* Mon Oct 06 2008 varkoly(a)suse.de +- (bnc#432405) - typo in mail.pot * Sun Sep 28 2008 varkoly(a)suse.de - Fixing (bnc#422022) - HTML markup shows in YAST dialogue * Thu Sep 11 2008 varkoly(a)suse.de ++++++ yast2-mail-2.16.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.9/src/mail-server_helps.ycp new/yast2-mail-2.16.9/src/mail-server_helps.ycp --- old/yast2-mail-2.16.9/src/mail-server_helps.ycp 2008-09-11 10:47:44.000000000 +0200 +++ new/yast2-mail-2.16.9/src/mail-server_helps.ycp 2008-10-06 12:16:08.000000000 +0200 @@ -94,9 +94,9 @@ _("<big>Configure Spam Learning Extension:</big> The spam learning extension can only be configured if the local delivery method is cyrus imapd. In this case the shared folders NewSpam and NoSpam will be created. Spam e-mail -which was not detected by SpamAssassin should be put into the folder NewSpam. +which was not detected by SpamAssassin should be put into the folder NewSpam. If you want your spam finder to be most effective you should also put non spam e-mail into -the folder NoSpam. The e-mails in this folder cannot be read by anyone. +the folder NoSpam. The e-mails in this folder cannot be read by anyone. "), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.9/src/YaPI/MailServer.pm new/yast2-mail-2.16.9/src/YaPI/MailServer.pm --- old/yast2-mail-2.16.9/src/YaPI/MailServer.pm 2008-09-28 10:46:32.000000000 +0200 +++ new/yast2-mail-2.16.9/src/YaPI/MailServer.pm 2008-10-06 13:40:51.000000000 +0200 @@ -1167,10 +1167,10 @@ my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', { 'service' => 'smtp', 'command' => 'smtpd'}); -print "SMTP"; -print Dumper ($smtp); -print "VSCAN"; -print Dumper ($vscan); +#print "SMTP"; +#print Dumper ($smtp); +#print "VSCAN"; +#print Dumper ($vscan); if( defined $smtp->[0] && defined $smtp->[0]->{'options'} ) { if( $smtp->[0]->{'options'}->{'content_filter'} eq 'smtp:[localhost]:10024' && $vscan ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit branding-openSUSE
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package branding-openSUSE checked in at Mon Oct 6 16:01:13 CEST 2008. -------- --- branding-openSUSE/branding-openSUSE.changes 2008-04-09 14:31:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes 2008-10-06 15:50:01.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 6 15:49:56 CEST 2008 - sbrabec(a)suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.DQ8254/_old 2008-10-06 15:59:05.000000000 +0200 +++ /var/tmp/diff_new_pack.DQ8254/_new 2008-10-06 15:59:05.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package branding-openSUSE (Version 11.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,13 +20,15 @@ Name: branding-openSUSE Version: 11.0 -Release: 3 -License: GPL v2 or later +Release: 36 +License: BSD 3-Clause Group: System/Fhs +Provides: branding +Conflicts: otherproviders(branding) Source: %{name}-COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Summary: SuSE brand file +Summary: SuSE Brand File %description This package contains the file /etc/SuSE-brand, and its name is used as @@ -50,6 +59,8 @@ %{_sysconfdir}/SuSE-brand %changelog +* Mon Oct 06 2008 sbrabec(a)suse.cz +- Conflict with other branding providers (FATE#304881). * Wed Apr 09 2008 sbrabec(a)suse.cz - Added COPYING file (bnc#373602). * Wed Mar 19 2008 sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-server
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-ldap-server checked in at Mon Oct 6 16:00:34 CEST 2008. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2008-09-29 13:56:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2008-10-01 16:11:28.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Oct 1 16:01:24 CEST 2008 - rhafer(a)suse.de + +- Verstion 2.17.9 + * revived commandline support (bnc#429486) + * additional checks when adding .schema files (bnc#431168) + * workaround for Firewall-Widget in installation proposal + (bnc#428364) + * fixed regression in initial server configuration (bnc#431250) + * use ldap-server icon in all wizards (bnc#431210) + * adjust size of Warning Popup (bnc#431228) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-server-2.17.8.tar.bz2 New: ---- yast2-ldap-server-2.17.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.UQ7855/_old 2008-10-06 15:58:56.000000000 +0200 +++ /var/tmp/diff_new_pack.UQ7855/_new 2008-10-06 15:58:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-server (Version 2.17.8) +# spec file for package yast2-ldap-server (Version 2.17.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ldap-server -Version: 2.17.8 +Version: 2.17.9 Release: 1 License: GPL v2 or later; X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.17.8.tar.bz2 +Source0: yast2-ldap-server-2.17.9.tar.bz2 Prefix: /usr BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-X500-DN perl-gettext pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users @@ -41,7 +41,7 @@ Andreas Bauer <abauer(a)suse.de> %prep -%setup -n yast2-ldap-server-2.17.8 +%setup -n yast2-ldap-server-2.17.9 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +86,15 @@ /usr/share/YaST2/scrconf/* %doc %{prefix}/share/doc/packages/yast2-ldap-server %changelog +* Wed Oct 01 2008 rhafer(a)suse.de +- Verstion 2.17.9 + * revived commandline support (bnc#429486) + * additional checks when adding .schema files (bnc#431168) + * workaround for Firewall-Widget in installation proposal + (bnc#428364) + * fixed regression in initial server configuration (bnc#431250) + * use ldap-server icon in all wizards (bnc#431210) + * adjust size of Warning Popup (bnc#431228) * Mon Sep 29 2008 rhafer(a)suse.de - Version 2.17.8 * revived AutoYaST support (bnc#429528) ++++++ yast2-ldap-server-2.17.8.tar.bz2 -> yast2-ldap-server-2.17.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/configure new/yast2-ldap-server-2.17.9/configure --- old/yast2-ldap-server-2.17.8/configure 2008-09-29 13:09:06.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/configure 2008-10-01 15:20:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.8. +# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -750,8 +750,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap-server' PACKAGE_TARNAME='yast2-ldap-server' -PACKAGE_VERSION='2.17.8' -PACKAGE_STRING='yast2-ldap-server 2.17.8' +PACKAGE_VERSION='2.17.9' +PACKAGE_STRING='yast2-ldap-server 2.17.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1529,7 +1529,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-ldap-server 2.17.8 to adapt to many kinds of systems. +\`configure' configures yast2-ldap-server 2.17.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1601,7 +1601,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap-server 2.17.8:";; + short | recursive ) echo "Configuration of yast2-ldap-server 2.17.9:";; esac cat <<\_ACEOF @@ -1714,7 +1714,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap-server configure 2.17.8 +yast2-ldap-server configure 2.17.9 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1728,7 +1728,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-ldap-server $as_me 2.17.8, which was +It was created by yast2-ldap-server $as_me 2.17.9, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2575,7 +2575,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap-server' - VERSION='2.17.8' + VERSION='2.17.9' cat >>confdefs.h <<_ACEOF @@ -2799,7 +2799,7 @@ -VERSION="2.17.8" +VERSION="2.17.9" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" @@ -22183,7 +22183,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ldap-server $as_me 2.17.8, which was +This file was extended by yast2-ldap-server $as_me 2.17.9, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22246,7 +22246,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-ldap-server config.status 2.17.8 +yast2-ldap-server config.status 2.17.9 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/configure.in new/yast2-ldap-server-2.17.9/configure.in --- old/yast2-ldap-server-2.17.8/configure.in 2008-09-29 13:08:47.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/configure.in 2008-10-01 15:19:59.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-server, 2.17.8, http://bugs.opensuse.org/, yast2-ldap-server) +AC_INIT(yast2-ldap-server, 2.17.9, http://bugs.opensuse.org/, yast2-ldap-server) 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.8" +VERSION="2.17.9" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/agent/SlapdConfigAgent.cc new/yast2-ldap-server-2.17.9/src/agent/SlapdConfigAgent.cc --- old/yast2-ldap-server-2.17.8/src/agent/SlapdConfigAgent.cc 2008-09-29 13:08:17.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/agent/SlapdConfigAgent.cc 2008-10-01 15:14:13.000000000 +0200 @@ -111,6 +111,7 @@ return ConfigToLdif(); } } catch ( std::runtime_error e ) { + y2error("Error during Read: %s", e.what() ); lastError->add(YCPString("summary"), YCPString(std::string( e.what() ) ) ); lastError->add(YCPString("description"), YCPString("") ); return YCPBoolean(false); @@ -1387,6 +1388,14 @@ std::string filename = arg->asString()->value_cstr(); y2milestone("adding Ldif File: %s", filename.c_str()); std::ifstream ldifFile(filename.c_str()); + if ( ! ldifFile ) + { + lastError->add( YCPString("summary"), + YCPString("Error while opening Schema file") ); + lastError->add( YCPString("description"), + YCPString("") ); + return YCPBoolean(false); + } try { LdifReader ldif(ldifFile); if ( ldif.readNextRecord() ) @@ -1434,6 +1443,14 @@ y2milestone("RDN will be: %s", dn.c_str()); std::ifstream input(filename.c_str()); + if ( ! input ) + { + lastError->add( YCPString("summary"), + YCPString("Error while opening Schema file") ); + lastError->add( YCPString("description"), + YCPString("") ); + return YCPBoolean(false); + } std::string schemaLine; LDAPEntry entry(dn), oldEntry; entry.addAttribute( LDAPAttribute( "objectClass", "olcSchemaConfig" ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/complex.ycp new/yast2-ldap-server-2.17.9/src/complex.ycp --- old/yast2-ldap-server-2.17.8/src/complex.ycp 2008-09-11 17:38:12.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/complex.ycp 2008-10-01 16:01:20.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: complex.ycp 50980 2008-09-10 15:11:53Z rhafer $ + * $Id: complex.ycp 51752 2008-10-01 14:01:20Z rhafer $ */ { @@ -170,7 +170,11 @@ } else if ( !serviceEnabled || !serviceRunning ) { - symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not currently running."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); + symbol ret = Popup::AnyQuestion3( _("Existing configuration detected."), + _("You have an existing configuration, but the LDAP server is currently not running. +Do you want to start the server now and re-read its configuration data or do you +want to create a new configuration from scratch?"), + _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); if ( ret == `yes ) { LdapServer::WriteServiceEnabled( true ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/dialogs.ycp new/yast2-ldap-server-2.17.9/src/dialogs.ycp --- old/yast2-ldap-server-2.17.8/src/dialogs.ycp 2008-09-12 14:57:53.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/dialogs.ycp 2008-10-01 15:46:50.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: dialogs.ycp 51109 2008-09-12 12:57:44Z rhafer $ + * $Id: dialogs.ycp 51750 2008-10-01 13:46:49Z rhafer $ */ { @@ -194,7 +194,7 @@ { map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ - "services": [ "ldap" , "ldaps" ], + "services": [ "service:openldap" ], "display_details": true, ]; map<string, any> firewall_widget = @@ -322,6 +322,7 @@ //close service dialog // UI::CloseDialog(); Wizard::CreateTreeDialog(); + Wizard::SetDesktopIcon("ldap-server"); //item selected at start current_tree_item = "daemon"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/LdapServer.pm new/yast2-ldap-server-2.17.9/src/LdapServer.pm --- old/yast2-ldap-server-2.17.8/src/LdapServer.pm 2008-09-29 13:08:17.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/LdapServer.pm 2008-10-01 15:14:13.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: LdapServer settings, input and output functions # Authors: Ralf Haferkamp <rhafer(a)suse.de>, Andreas Bauer <abauer(a)suse.de> # -# $Id: LdapServer.pm 51556 2008-09-25 19:31:17Z rhafer $ +# $Id: LdapServer.pm 51745 2008-10-01 13:14:00Z rhafer $ # # Representation of the configuration of ldap-server. # Input and output routines. @@ -34,6 +34,7 @@ my %error = ( msg => undef, details => undef ); my $usingDefaults = 1; +my $readConfig = 0; my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; @@ -231,6 +232,7 @@ SCR->Execute('.ldapserver.init' ); my $rc = SCR->Read('.ldapserver.databases'); $usingDefaults = 0; + $readConfig = 1; } else { @@ -656,6 +658,11 @@ Progress->Finish(); return 1; } + if ( ! $wasEnabled && $serviceEnabled ) + { + Service->Enable("ldap"); + Service->Start("ldap"); + } my $progressItems = [ _("Writing Sysconfig files"), _("Applying changes to Configuration Database"), _("Applying changes to /etc/openldap/ldap.conf"), @@ -931,7 +938,7 @@ # Configuration summary text for autoyast my $self = shift; my $string; - if ( keys(%dbDefaults) && $usingDefaults ) + if ( keys(%dbDefaults) && ! $readConfig ) { $string .= '<h2>'._("Startup Configuration").'</h2>' .''._("Start LDAP Server: ").'<code>'.($dbDefaults{'serviceEnabled'}->value?_("Yes"):_("No")).'</code>' @@ -1416,9 +1423,17 @@ { bind_dn => $dbDefaults{'rootdn'}, bind_pw => $dbDefaults{'rootpw_clear'} } ); $usingDefaults = 0; + $readConfig = 1; return 1; } +## + # Read the list of configured Databases. + # + # @return A list of hashes. Each hash represents a database and has the keys + # 'type' (e.g. "hdb" or "bdb"), 'suffix' (the base DN of the database) and + # 'index' (the index number used by back-config to order databases correctly) + # BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } sub ReadDatabaseList { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/ldap-server_proposal.ycp new/yast2-ldap-server-2.17.9/src/ldap-server_proposal.ycp --- old/yast2-ldap-server-2.17.8/src/ldap-server_proposal.ycp 2008-09-29 13:08:17.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/ldap-server_proposal.ycp 2008-10-01 15:14:13.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Proposal function dispatcher. * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: ldap-server_proposal.ycp 51630 2008-09-29 11:07:56Z rhafer $ + * $Id: ldap-server_proposal.ycp 51738 2008-10-01 12:06:34Z rhafer $ * * Proposal function dispatcher for ldap-server configuration. * See source/installation/proposal/proposal-API.txt @@ -59,6 +59,12 @@ { y2milestone ("Openldap2 is not installed. --> service disabled"); LdapServer::WriteServiceEnabled (false); + // temporarly create the services file for the Firewallsettings + if (SCR::Read(.target.size, "/etc/sysconfig/SuSEfirewall2.d/services/openldap") <= 0) + { + SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/openldap", + "TCP=\"ldap ldaps\"\nUDP=\"ldap\"\n" ); + } } else { @@ -101,7 +107,7 @@ y2milestone("Zones used by firewall: %1", used_zones); foreach (string zone, used_zones, { - if (SuSEFirewall::IsServiceSupportedInZone ("ldap", zone)) + if (SuSEFirewall::IsServiceSupportedInZone ("service:openldap", zone)) is_ldap_enabled = true; }); } @@ -179,6 +185,11 @@ else if(func == "Write") { if( LdapServer::Configured() ) return ret; + if (!Package::Installed ("openldap2")) + { + //remove temp file + SCR::Execute(.target.remove, "/etc/sysconfig/SuSEfirewall2.d/services/openldap"); + } if( LdapServer::ReadServiceEnabled() ) { /* ensure openldap2 package is installed */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/ldap-server.ycp new/yast2-ldap-server-2.17.9/src/ldap-server.ycp --- old/yast2-ldap-server-2.17.8/src/ldap-server.ycp 2008-09-18 15:50:25.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/ldap-server.ycp 2008-10-01 15:14:13.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: ldap-server.ycp 51284 2008-09-18 13:50:25Z rhafer $ + * $Id: ldap-server.ycp 51737 2008-10-01 12:06:31Z rhafer $ * * Main file for ldap-server configuration. Uses all other files. */ @@ -34,22 +34,23 @@ ["enable", "disable" ] ); if( command == nil ) return false; -// LdapServer::WriteServiceEnabled( command == "enable" ); + LdapServer::WriteServiceEnabled( command == "enable" ); return true; } define boolean getDatabaseListHandler (map options) { -// map<string, any> edb = LdapServer::ReadDatabase(); -// -// string s = ""; -// foreach( string suffix, any value, edb, -// { -// s = s + suffix + " "; -// }); -// -// CommandLine::Print (RichText::Rich2Plain(" "+s)); + list<map<string, string> > dbList = LdapServer::ReadDatabaseList(); + + string s = ""; + foreach( map<string,string> db, dbList, + { + s = s + db["suffix"]:"" + " (" + db["type"]:"" + ") " + " "; + } + ); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); return false; } @@ -63,48 +64,47 @@ // y2milestone("DBs: %1", edb); // // -// if (options["basedn"]:nil != nil && -// edb[options["basedn"]:""]:nil == nil) -// { -// db["suffix"] = options["basedn"]:""; -// } -// else -// { -// CommandLine::Print (_("No basedn provided or a database with the provided basedn does already \nexist")); -// return false; -// } -// if (options["rootdn"]:nil != nil) -// { -// db["rootdn"] = options["rootdn"]:""; -// } -// if (options["password"]:nil != nil) -// { -// db["passwd"] = options["password"]:""; -// } -// if (options["enctype"]:nil != nil) -// { -// db["cryptmethod"] = options["enctype"]:""; -// } -// if (options["dbdir"]:nil != nil) -// { -// db["directory"] = options["dbdir"]:""; -// } -// -// if(LdapServer::ReadServiceEnabled() == false) -// { -// // Database cannot be written when the service is not enabled -// LdapServer::WriteServiceEnabled(true); -// } -// + if (options["basedn"]:nil != nil ) + { + db["suffix"] = options["basedn"]:""; + } + else + { + CommandLine::Print (_("No basedn provided\n")); + return false; + } + db["type"] = options["type"]:"hdb"; + if (options["rootdn"]:nil != nil) + { + db["rootdn"] = options["rootdn"]:""; + } + if (options["password"]:nil != nil) + { + db["rootpw_clear"] = options["password"]:""; + } + db["pwenctype"] = options["enctype"]:"SSHA"; + if (options["dbdir"]:nil != nil) + { + db["directory"] = options["dbdir"]:""; + } + + if(LdapServer::ReadServiceEnabled() == false) + { + Report::Error(_("Database cannot be created when the service is not enabled")); + return false; + } + // y2milestone("db-options : %1", db); // -// ret = LdapServer::AddDatabase(db); -// -// if(!ret) -// { -// CommandLine::Print (_("Error while adding the database")); -// return false; -// } + ret = LdapServer::AddDatabase(0,db, true); + + if(!ret) + { + CommandLine::Print (_("Error while adding the database")); + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } return true; } @@ -112,87 +112,38 @@ string s = ""; integer i = 0; -// foreach(string v, LdapServer::ReadSchemaIncludeList (), -// { -// i = i + 1; -// s = s + tostring(i) + " "+ v +" "; -// }); -// -// CommandLine::Print (RichText::Rich2Plain(" "+s)); + foreach(string v, LdapServer::ReadSchemaList (), + { + if ( v != "schema" ) // skip the baseentry (hardcoded schema) + s = s + " "+ v +" "; + }); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); return false; // do not call Write... } define boolean addSchemaHandler (map options ) { - boolean ret = false; -// if (options["file"]:"" != "") -// { -// string file = options["file"]:""; -// if(options["pos"]:"" != "") -// { -// integer pos = tointeger (options["pos"]:""); -// if (pos == nil || pos < 0) -// { -// // error: wrong input (probably string or negative integer) -// Report::Error (_("The value for pos must be a positive integer.")); -// return false; -// } -// -// list<string> l = LdapServer::ReadSchemaIncludeList (); -// list<string> rl = []; -// boolean added = false; -// integer i = 0; -// foreach(string s, l, -// { -// i = i + 1; -// if(i == pos) -// { -// rl = add(rl, file); -// added = true; -// } -// rl = add(rl, s); -// }); -// if(!added) -// { -// rl = add(rl, file); -// } -// LdapServer::WriteSchemaIncludeList (rl); -// ret = true; -// } -// } - - return ret; -} - -define boolean delSchemaHandler (map options ) { - - boolean ret = false; -// if(options["pos"]:"" != "") -// { -// integer pos = tointeger (options["pos"]:""); -// if (pos == nil || pos < 0) -// { -// // error: wrong input (probably string or negative integer) -// Report::Error (_("The value for pos must be a positive integer.")); -// return false; -// } -// -// list<string> l = LdapServer::ReadSchemaIncludeList (); -// list<string> rl = []; -// integer i = 0; -// foreach(string s, l, -// { -// i = i + 1; -// if(i != pos) -// { -// rl = add(rl, s); -// } -// }); -// LdapServer::WriteSchemaIncludeList (rl); -// ret = true; -// } - - return ret; + if (options["file"]:"" != "") + { + string file = options["file"]:""; + if ( regexpmatch( file, ".*\.schema$" ) ) + { + if (! LdapServer::AddSchemaToSchemaList(file) ) { + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } + } + else if (! LdapServer::AddLdifToSchemaList(file) ) + { + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } + return true; + } + return false; } @@ -225,14 +176,14 @@ "handler" : addSchemaHandler, "help" : _("Add a schema to the list"), ], - "delSchema": $[ - "handler" : delSchemaHandler, - "help" : _("Delete a schema from the list"), - ], ], "options" : $[ "enable" : $[ "help" : _("Enable the service") ], "disable" : $[ "help" : _("Disable the service") ], + "type" : $[ + "help" : _("Database type (\"hdb\" or \"bdb\")"), + "type" : "string" + ], "basedn" : $[ "help" : _("Base DN for the database"), "type" : "string" @@ -264,11 +215,10 @@ ], "mappings" : $[ "service" :[ "enable", "disable" ], - "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir" ], + "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir", "type" ], "getDatabaseList" : [], "getSchemaList" : [], - "addSchema": [ "file", "pos" ], - "delSchema": [ "pos" ] + "addSchema": [ "file" ] ] ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/wizards.ycp new/yast2-ldap-server-2.17.9/src/wizards.ycp --- old/yast2-ldap-server-2.17.8/src/wizards.ycp 2008-09-29 13:08:17.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/src/wizards.ycp 2008-10-01 15:46:50.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: wizards.ycp 51476 2008-09-24 14:55:34Z rhafer $ + * $Id: wizards.ycp 51750 2008-10-01 13:46:49Z rhafer $ */ { @@ -44,6 +44,7 @@ ] ]; + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); return ret; @@ -55,6 +56,7 @@ term contents = `Label(_("Initializing...")); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); @@ -95,6 +97,7 @@ term contents = `Label(_("Initializing...")); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); @@ -183,6 +186,7 @@ y2milestone( "--> starting MigrateSequence" ); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); y2milestone( "--> MigrateSequence finished " ); @@ -240,6 +244,7 @@ ]; Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); @@ -262,6 +267,7 @@ y2milestone ( "--> starting LdapServerAutoSequence" ); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/VERSION new/yast2-ldap-server-2.17.9/VERSION --- old/yast2-ldap-server-2.17.8/VERSION 2008-09-29 13:08:17.000000000 +0200 +++ new/yast2-ldap-server-2.17.9/VERSION 2008-10-01 15:14:22.000000000 +0200 @@ -1 +1 @@ -2.17.8 +2.17.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-client
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-ldap-client checked in at Mon Oct 6 15:58:47 CEST 2008. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2008-09-25 09:22:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-client/yast2-ldap-client.changes 2008-10-01 15:35:44.347630000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 1 15:11:55 CEST 2008 - jsuchome(a)suse.cz + +- fixed help text (bnc#430521) +- 2.17.11 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.17.10.tar.bz2 New: ---- yast2-ldap-client-2.17.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.AJ7132/_old 2008-10-06 15:58:41.000000000 +0200 +++ /var/tmp/diff_new_pack.AJ7132/_new 2008-10-06 15:58:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.17.10) +# spec file for package yast2-ldap-client (Version 2.17.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ldap-client -Version: 2.17.10 +Version: 2.17.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.17.10.tar.bz2 +Source0: yast2-ldap-client-2.17.11.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite PreReq: %fillup_prereq @@ -54,7 +54,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-ldap-client-2.17.10 +%setup -n yast2-ldap-client-2.17.11 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +94,9 @@ %doc %{prefix}/share/doc/packages/yast2-ldap-client /var/adm/fillup-templates/sysconfig.ldap %changelog +* Wed Oct 01 2008 jsuchome(a)suse.cz +- fixed help text (bnc#430521) +- 2.17.11 * Thu Sep 25 2008 jsuchome(a)suse.cz - do not restart dbus service, reload it (bnc#429520) - 2.17.10 ++++++ yast2-ldap-client-2.17.10.tar.bz2 -> yast2-ldap-client-2.17.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.10/src/LdapPopup.ycp new/yast2-ldap-client-2.17.11/src/LdapPopup.ycp --- old/yast2-ldap-client-2.17.10/src/LdapPopup.ycp 2008-09-09 11:18:16.000000000 +0200 +++ new/yast2-ldap-client-2.17.11/src/LdapPopup.ycp 2008-10-01 15:11:25.000000000 +0200 @@ -577,7 +577,7 @@ _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + // help text for pwdCheckQuality attribute - _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + // help text for pwdMinLength attribute _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.10/src/Ldap.ycp new/yast2-ldap-client-2.17.11/src/Ldap.ycp --- old/yast2-ldap-client-2.17.10/src/Ldap.ycp 2008-09-25 09:07:51.000000000 +0200 +++ new/yast2-ldap-client-2.17.11/src/Ldap.ycp 2008-09-25 09:21:44.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 51273 2008-09-18 12:20:16Z jsuchome $ + * $Id: Ldap.ycp 51493 2008-09-25 07:22:26Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.10/VERSION new/yast2-ldap-client-2.17.11/VERSION --- old/yast2-ldap-client-2.17.10/VERSION 2008-09-25 09:08:24.000000000 +0200 +++ new/yast2-ldap-client-2.17.11/VERSION 2008-10-01 15:12:22.000000000 +0200 @@ -1 +1 @@ -2.17.10 +2.17.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-kdump
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-kdump checked in at Mon Oct 6 15:58:33 CEST 2008. -------- --- yast2-kdump/yast2-kdump.changes 2008-09-22 16:53:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-kdump/yast2-kdump.changes 2008-10-06 12:21:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 3 17:31:33 CEST 2008 - juhliarik(a)suse.cz + +- added fix for installing packages (bnc #431580) +- V 2.17.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-kdump-2.17.4.tar.bz2 New: ---- yast2-kdump-2.17.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kdump.spec ++++++ --- /var/tmp/diff_new_pack.Zp6105/_old 2008-10-06 15:58:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Zp6105/_new 2008-10-06 15:58:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-kdump (Version 2.17.4) +# spec file for package yast2-kdump (Version 2.17.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,18 @@ Name: yast2-kdump -Version: 2.17.4 +Version: 2.17.5 Release: 1 License: GPL v2 only Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-kdump-2.17.4.tar.bz2 +Source0: yast2-kdump-2.17.5.tar.bz2 Prefix: /usr Requires: yast2 yast2-storage yast2-bootloader BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-storage yast2-testsuite Recommends: makedumpfile +BuildRequires: yast2 >= 2.17.36 +BuildRequires: yast2-packager >= 2.17.24 Summary: Configuration of kdump %description @@ -41,7 +43,7 @@ Jozef Uhliarik <juhliarik(a)suse.cz> %prep -%setup -n yast2-kdump-2.17.4 +%setup -n yast2-kdump-2.17.5 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +78,9 @@ /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-kdump %changelog +* Fri Oct 03 2008 juhliarik(a)suse.cz +- added fix for installing packages (bnc #431580) +- V 2.17.5 * Mon Sep 22 2008 juhliarik(a)suse.cz - added new tree item Email Notification - fix for problem with ncurses (bnc #373551) ++++++ yast2-kdump-2.17.4.tar.bz2 -> yast2-kdump-2.17.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.4/src/Kdump.ycp new/yast2-kdump-2.17.5/src/Kdump.ycp --- old/yast2-kdump-2.17.4/src/Kdump.ycp 2008-09-19 18:15:17.000000000 +0200 +++ new/yast2-kdump-2.17.5/src/Kdump.ycp 2008-10-03 17:12:58.000000000 +0200 @@ -51,6 +51,7 @@ import "Map"; import "ProductControl"; import "ProductFeatures"; +import "PackagesProposal"; /** * Prototypes @@ -940,34 +941,25 @@ boolean pkg_deselect = false; foreach (string p, kdump_packages, { - if (Pkg::IsSelected (p)) - { - Pkg::PkgNeutral (p); + PackagesProposal::RemoveResolvables ("yast2-kdump", `package, [p]); pkg_deselect = true; - } }); if (pkg_deselect) { - // if package was added in inst. proposal, I can't be sure - // that dependencies will be solved - Pkg::PkgSolve (false); + y2milestone("Deselected kdump packages for installation: %1", kdump_packages); } } else { y2milestone("select packages for installation: %1", kdump_packages); boolean pkg_added = false; foreach (string p, kdump_packages, { - if (!Pkg::IsSelected (p)) - { - Pkg::PkgInstall (p); + PackagesProposal::AddResolvables ("yast2-kdump", `package, [p]); pkg_added = true; - } + }); if (pkg_added) { - // if package was added in inst. proposal, I can't be sure - // that dependencies will be solved - Pkg::PkgSolve (false); + y2milestone("Selected kdump packages for installation: %1", kdump_packages); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.4/VERSION new/yast2-kdump-2.17.5/VERSION --- old/yast2-kdump-2.17.4/VERSION 2008-09-22 16:46:08.000000000 +0200 +++ new/yast2-kdump-2.17.5/VERSION 2008-10-03 10:45:37.000000000 +0200 @@ -1 +1 @@ -2.17.4 +2.17.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-installation checked in at Mon Oct 6 15:57:58 CEST 2008. -------- --- yast2-installation/yast2-installation.changes 2008-09-26 15:56:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-10-02 13:43:54.000000000 +0200 @@ -1,0 +2,49 @@ +Thu Oct 2 11:39:48 CEST 2008 - locilka(a)suse.cz + +- Using two default desktops, one for inst_scenarios, another + one (default) while inst_scenarios not used (bnc #431251, + bnc #431503). +- Switching scenario_virtual_machine and + scenario_virtualization_host in SLES control file (bnc #431251). +- 2.17.17 + +------------------------------------------------------------------- +Wed Oct 1 16:03:32 CEST 2008 - mzugec(a)suse.de + +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.16 + +------------------------------------------------------------------- +Wed Oct 1 15:41:12 CEST 2008 - jsuchome(a)suse.cz + +- if nn_NO language is selected, use nb_NO in YaST (bnc#426124) + +------------------------------------------------------------------- +Wed Oct 1 13:42:18 CEST 2008 - locilka(a)suse.cz + +- Changing pattern "Documentation" to "documentation" (bnc #431218) + +------------------------------------------------------------------- +Tue Sep 30 13:20:09 CEST 2008 - locilka(a)suse.cz + +- Replacing "networkmanager" proposal call with "general" + (bnc #430704). + +------------------------------------------------------------------- +Mon Sep 29 15:11:33 CEST 2008 - locilka(a)suse.cz + +- Server scenarios work for i386, x86_64 archs only (bnc #430612). + +------------------------------------------------------------------- +Mon Sep 29 14:56:45 CEST 2008 - kukuk(a)suse.de + +- Replaced Minimal+Xen with Dom0. +- Removed xen_server from virtualization machine (bnc #429061). +- Added "XEN" suffix to Virtualization Host. + +------------------------------------------------------------------- +Mon Sep 29 13:38:13 CEST 2008 - locilka(a)suse.cz + +- Adding inst_lilo_convert to the update workflow (bnc #430579). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.17.14.tar.bz2 New: ---- yast2-installation-2.17.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.sy3639/_old 2008-10-06 15:56:34.000000000 +0200 +++ /var/tmp/diff_new_pack.sy3639/_new 2008-10-06 15:56:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.17.14) +# spec file for package yast2-installation (Version 2.17.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-installation -Version: 2.17.14 -Release: 2 +Version: 2.17.17 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.17.14.tar.bz2 +Source0: yast2-installation-2.17.17.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -41,8 +41,8 @@ # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) Requires: yast2-country-data >= 2.16.11 -# Unified progress bar (done by visnov) -Requires: yast2-packager >= 2.17.9 +# Packages::required_patterns +Requires: yast2-packager >= 2.17.23 # Only in inst-sys # Requires: yast2-runlevel # Requires: yast2-network @@ -114,7 +114,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.17.14 +%setup -n yast2-installation-2.17.17 %build %{prefix}/bin/y2tool y2autoconf @@ -183,6 +183,31 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Thu Oct 02 2008 locilka(a)suse.cz +- Using two default desktops, one for inst_scenarios, another + one (default) while inst_scenarios not used (bnc #431251, + bnc #431503). +- Switching scenario_virtual_machine and + scenario_virtualization_host in SLES control file (bnc #431251). +- 2.17.17 +* Wed Oct 01 2008 mzugec(a)suse.de +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.16 +* Wed Oct 01 2008 jsuchome(a)suse.cz +- if nn_NO language is selected, use nb_NO in YaST (bnc#426124) +* Wed Oct 01 2008 locilka(a)suse.cz +- Changing pattern "Documentation" to "documentation" (bnc #431218) +* Tue Sep 30 2008 locilka(a)suse.cz +- Replacing "networkmanager" proposal call with "general" + (bnc #430704). +* Mon Sep 29 2008 locilka(a)suse.cz +- Server scenarios work for i386, x86_64 archs only (bnc #430612). +* Mon Sep 29 2008 kukuk(a)suse.de +- Replaced Minimal+Xen with Dom0. +- Removed xen_server from virtualization machine (bnc #429061). +- Added "XEN" suffix to Virtualization Host. +* Mon Sep 29 2008 locilka(a)suse.cz +- Adding inst_lilo_convert to the update workflow (bnc #430579). * Fri Sep 26 2008 locilka(a)suse.cz - Optimizing server_selections dialog layout (bnc #429977). - Better text for installation initialization (bnc #428103). ++++++ yast2-installation-2.17.14.tar.bz2 -> yast2-installation-2.17.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/configure new/yast2-installation-2.17.17/configure --- old/yast2-installation-2.17.14/configure 2008-09-22 15:21:43.000000000 +0200 +++ new/yast2-installation-2.17.17/configure 2008-10-02 13:54:07.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-installation 2.17.13. +# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.17. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.17.13' -PACKAGE_STRING='yast2-installation 2.17.13' +PACKAGE_VERSION='2.17.17' +PACKAGE_STRING='yast2-installation 2.17.17' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1208,7 +1208,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-installation 2.17.13 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.17.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1279,7 +1279,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.17.13:";; + short | recursive ) echo "Configuration of yast2-installation 2.17.17:";; esac cat <<\_ACEOF @@ -1357,7 +1357,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.17.13 +yast2-installation configure 2.17.17 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1371,7 +1371,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-installation $as_me 2.17.13, which was +It was created by yast2-installation $as_me 2.17.17, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2192,7 +2192,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.17.13' + VERSION='2.17.17' cat >>confdefs.h <<_ACEOF @@ -2420,7 +2420,7 @@ -VERSION="2.17.13" +VERSION="2.17.17" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3563,7 +3563,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.17.13, which was +This file was extended by yast2-installation $as_me 2.17.17, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3606,7 +3606,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.17.13 +yast2-installation config.status 2.17.17 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-installation-2.17.14/configure.in new/yast2-installation-2.17.17/configure.in --- old/yast2-installation-2.17.14/configure.in 2008-09-22 15:21:40.000000000 +0200 +++ new/yast2-installation-2.17.17/configure.in 2008-10-02 13:54:04.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.17.13, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.17.17, http://bugs.opensuse.org/, yast2-installation) 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.13" +VERSION="2.17.17" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.17.17/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.17.14/src/clients/inst_complex_welcome.ycp 2008-09-08 17:42:46.000000000 +0200 +++ new/yast2-installation-2.17.17/src/clients/inst_complex_welcome.ycp 2008-10-01 15:44:06.000000000 +0200 @@ -239,7 +239,14 @@ Language::WfmSetGivenLanguage ("en_US"); } else if (ret == `language) { Console::SelectFont (language); - Language::WfmSetLanguage (); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using Bokmål"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/src/clients/inst_finish.ycp new/yast2-installation-2.17.17/src/clients/inst_finish.ycp --- old/yast2-installation-2.17.14/src/clients/inst_finish.ycp 2008-09-05 14:47:50.000000000 +0200 +++ new/yast2-installation-2.17.17/src/clients/inst_finish.ycp 2008-09-25 15:20:42.000000000 +0200 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 50750 2008-09-05 12:47:50Z locilka $ + * $Id: inst_finish.ycp 51511 2008-09-25 12:33:20Z juhliarik $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -30,6 +30,7 @@ import "Wizard"; import "String"; import "GetInstArgs"; + import "ProductFeatures"; // added for fate# 303395 import "Directory"; @@ -106,6 +107,7 @@ "label" : _("Install boot manager"), "steps" : [ "bootloader", + ((ProductFeatures::GetBooleanFeature ("globals", "enable_kdump") == true) ? "kdump" : "") ], "icon" : "yast-bootloader", ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/src/clients/inst_initialization.ycp new/yast2-installation-2.17.17/src/clients/inst_initialization.ycp --- old/yast2-installation-2.17.14/src/clients/inst_initialization.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.17/src/clients/inst_initialization.ycp 2008-09-26 14:38:42.000000000 +0200 @@ -34,7 +34,7 @@ // TRANSLATORS: dialog help helptext = _("Please wait..."); // TRANSLATORS: dialog progress message - label = _("Preparing the 1st system configuration..."); + label = _("Preparing the initial system configuration..."); } term content = `VBox ( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/src/clients/inst_scenarios.ycp new/yast2-installation-2.17.17/src/clients/inst_scenarios.ycp --- old/yast2-installation-2.17.14/src/clients/inst_scenarios.ycp 2008-08-07 15:24:21.000000000 +0200 +++ new/yast2-installation-2.17.17/src/clients/inst_scenarios.ycp 2008-10-02 13:25:34.000000000 +0200 @@ -20,6 +20,8 @@ import "Popup"; import "PackageCallbacks"; import "Report"; + import "Packages"; + import "DefaultDesktop"; boolean test_mode = false; @@ -29,14 +31,15 @@ } // load supported scenarios from control file - list <map <string, string> > system_scenarios = - (list <map <string, string> >) ProductFeatures::GetFeature ("software", "system_scenarios"); + any any_scenarios = ProductFeatures::GetFeature ("software", "system_scenarios"); - if (system_scenarios == nil || system_scenarios == []) { + if (any_scenarios == nil || any_scenarios == "" || any_scenarios == []) { y2error ("Undefined software->system_scenarios"); return `auto; } + list <map <string, string> > system_scenarios = (list <map <string, string> >) any_scenarios; + /** * Adjusts UI - selected radio button */ @@ -109,12 +112,21 @@ // select newly selected patterns for installation foreach (map <string, string> one_scenario, system_scenarios, { if (one_scenario["id"]:"---" == chosen_selection) { - foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + list <string> patterns_to_install = splitstring (one_scenario["patterns"]:"", " \t"); + + foreach (string one_pattern, patterns_to_install, { y2milestone ("Selecting pattern: %1", one_pattern); Pkg::ResolvableInstall (one_pattern, `pattern); }); + + Packages::required_patterns = patterns_to_install; + y2milestone ("Packages::required_patterns: %1", Packages::required_patterns); } }); + + string desktop = ProductFeatures::GetStringFeature ("software", "scenarios_desktop"); + y2milestone ("Using default desktop: %1", desktop); + DefaultDesktop::SetDesktop (desktop); } // adjusting test mode - not used in installation @@ -144,13 +156,11 @@ `HBox (`Image (Icon::IconPath (one_scenario["icon"]:""), ""), `HSpacing (2)) ) ), - `HWeight ( - 4, - `Left (`RadioButton ( - `id (one_scenario["id"]:""), - ProductControl::GetTranslatedText (one_scenario["id"]:"") - )) - ) + `Left (`RadioButton ( + `id (one_scenario["id"]:""), + ProductControl::GetTranslatedText (one_scenario["id"]:"") + )), + `HStretch() )); dialog_content = add (dialog_content, `VSpacing (0.8)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.17.17/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.17.14/src/clients/inst_upgrade_urls.ycp 2008-09-23 12:15:16.000000000 +0200 +++ new/yast2-installation-2.17.17/src/clients/inst_upgrade_urls.ycp 2008-09-26 15:41:45.000000000 +0200 @@ -25,6 +25,8 @@ boolean test_mode = false; + integer do_not_remove = 0; + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { y2milestone ("Args: %1", WFM::Args()); if (WFM::Args(0) == "test") @@ -786,7 +788,7 @@ list <string> sources_to_add_disabled = []; // bnc #400823 - integer do_not_remove = Pkg::SourceGetCurrent(false)[0]:0; + do_not_remove = Pkg::SourceGetCurrent(false)[0]:0; foreach (map one_source, urls, { string url = one_source["url"]:""; @@ -830,6 +832,14 @@ sources_to_add = []; } + sources_to_remove = filter (integer one_source, sources_to_remove, { + return (one_source != do_not_remove); + }); + + sources_to_add_disabled = filter (string one_source, sources_to_add_disabled, { + return (one_source != sformat ("ID: %1", do_not_remove)); + }); + SetAddRemoveSourcesProgress (sources_to_remove, sources_to_add, sources_to_add_disabled); PackageCallbacks::RegisterEmptyProgressCallbacks(); @@ -904,6 +914,9 @@ }); } + // bnc #400823 + do_not_remove = Pkg::SourceGetCurrent(false)[0]:0; + UseOldOrNewURLs(); RemoveInstallationReposFromUpgrededSystemOnes(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/startup/Second-Stage/S07-medium new/yast2-installation-2.17.17/startup/Second-Stage/S07-medium --- old/yast2-installation-2.17.14/startup/Second-Stage/S07-medium 2008-04-17 11:08:38.000000000 +0200 +++ new/yast2-installation-2.17.17/startup/Second-Stage/S07-medium 2008-10-02 11:30:05.000000000 +0200 @@ -25,7 +25,7 @@ if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then log "\tnetwork configuration found -> activate network" rcnetwork start -o onboot && Y2_NETWORK_ACTIVE=1 - [ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start + [ -f /var/lib/YaST2/network_install_rpcbind ] && rcrpcbind start fi #============================================= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.14/VERSION new/yast2-installation-2.17.17/VERSION --- old/yast2-installation-2.17.14/VERSION 2008-09-24 13:44:34.000000000 +0200 +++ new/yast2-installation-2.17.17/VERSION 2008-10-02 13:46:00.000000000 +0200 @@ -1 +1 @@ -2.17.14 +2.17.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0