Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2012-02-08 17:21:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-client", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2011-11-05 12:18:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2012-02-08 17:21:51.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 8 12:00:10 UTC 2012 - [email protected] + +- Base server hostname combobox on existing values - bnc#547983 + +------------------------------------------------------------------- +Wed Dec 7 10:05:12 UTC 2011 - [email protected] + +- fix license to be in spdx.org format + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-2.21.2.tar.bz2 New: ---- yast2-nfs-client-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.ab50pB/_old 2012-02-08 17:21:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ab50pB/_new 2012-02-08 17:21:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nfs-client # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: yast2-nfs-client -Version: 2.21.2 +Version: 2.21.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-nfs-client-2.21.2.tar.bz2 -> yast2-nfs-client-2.21.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.2/VERSION new/yast2-nfs-client-2.21.3/VERSION --- old/yast2-nfs-client-2.21.2/VERSION 2011-11-03 13:41:29.000000000 +0100 +++ new/yast2-nfs-client-2.21.3/VERSION 2012-02-08 13:03:19.000000000 +0100 @@ -1 +1 @@ -2.21.2 +2.21.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.2/configure.in new/yast2-nfs-client-2.21.3/configure.in --- old/yast2-nfs-client-2.21.2/configure.in 2011-11-03 13:42:14.000000000 +0100 +++ new/yast2-nfs-client-2.21.3/configure.in 2012-02-08 09:15:49.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-nfs-client dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-nfs-client, 2.21.2, http://bugs.opensuse.org/, yast2-nfs-client) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.2/src/ui.ycp new/yast2-nfs-client-2.21.3/src/ui.ycp --- old/yast2-nfs-client-2.21.2/src/ui.ycp 2011-11-01 13:19:30.000000000 +0100 +++ new/yast2-nfs-client-2.21.3/src/ui.ycp 2012-02-08 13:06:32.000000000 +0100 @@ -13,7 +13,7 @@ * Dan Vesely <[email protected]> * Martin Vidner <[email protected]> * - * $Id: ui.ycp 64602 2011-06-27 12:20:15Z jreidinger $ + * $Id: ui.ycp 67377 2012-02-08 12:03:57Z mfilka $ * * Network NFS client dialogs * @@ -58,6 +58,11 @@ list<string> hosts = nil; /** + * List of already defined nfs mount points + */ + list< map <string,any> > nfs_entries = Nfs::nfs_entries; + + /** * Let the user choose one of a list of items * @param title selectionbox title * @param items a list of items @@ -178,6 +183,7 @@ `Bottom (button) ); } + /** * Ask user for an entry. * @param fstab_ent $["spec": "file": "mntops":] or nil @@ -213,6 +219,21 @@ servers = [ proposed_server ]; } + // append already defined servers - bug #547983 + foreach( map nfs_entry, nfs_entries, + { + term couple = SpecToServPath( nfs_entry[ "spec"]:""); + string known_server = ""; + + known_server = couple[0]:""; + + if( !contains( servers, known_server)) + servers = add( servers, known_server); + }); + + servers = sort( servers); + // + UI::OpenDialog( `opt(`decorated), `HBox( @@ -232,7 +253,8 @@ ), `HSpacing(0.5), TextAndButton ( - `TextEntry(`id(`pathent), + `InputField( `id(`pathent), + `opt(`hstretch), // textentry label _("&Remote Directory"), pth), // pushbutton label, @@ -245,7 +267,8 @@ `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( TextAndButton ( - `TextEntry(`id(`mountent), + `InputField(`id(`mountent), + `opt(`hstretch), // textentry label _("&Mount Point (local)"), mount), // button label @@ -256,7 +279,7 @@ ), // textentry label `VSpacing(0.2), - `TextEntry(`id(`optionsent), _("O&ptions"), options), + `InputField(`id(`optionsent), `opt( `hstretch), _("O&ptions"), options), `VSpacing(0.2), `ButtonBox( `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -468,7 +491,6 @@ ]; map<string,any> fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings); - list< map <string,any> > nfs_entries = Nfs::nfs_entries; map <string, any> modify_line = $[]; // Help, part 1 of 3 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
