Mailinglist Archive: opensuse-commit (1945 mails)

< Previous Next >
commit yast2-nfs-client
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 03 Nov 2008 14:36:51 +0100
  • Message-id: <20081103133651.9C4ED6780AA@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-nfs-client
checked in at Mon Nov 3 14:36:51 CET 2008.


--------
--- yast2-nfs-client/yast2-nfs-client.changes 2008-10-20 13:00:22.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes
2008-11-03 10:45:03.499042000 +0100
@@ -1,0 +2,18 @@
+Fri Oct 31 16:45:29 CET 2008 - kmachalkova@xxxxxxx
+
+- Pass no data to the partitioner if the user decides to cancel
+ add/edit/delete NFS share operation
+- Correct AY backwards compatibility code if 'vfstype' key is missing
+ on Import - assume plain nfs in that case (bnc#438497)
+- 2.17.8
+
+-------------------------------------------------------------------
+Wed Oct 29 18:12:10 CET 2008 - kmachalkova@xxxxxxx
+
+- Correct enabling/disabling of edit and delete buttons depending
+ on # of NFS shares (bnc#438665)
+- Initialize only non-fstab NFS settings (firewall, sysconfig, idmapd)
+ if the client is run embedded in the partitioner (bnc#436897)
+- 2.17.7
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
yast2-nfs-client-2.17.6.tar.bz2

New:
----
yast2-nfs-client-2.17.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.TZ1458/_old 2008-11-03 14:36:34.000000000 +0100
+++ /var/tmp/diff_new_pack.TZ1458/_new 2008-11-03 14:36:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nfs-client (Version 2.17.6)
+# spec file for package yast2-nfs-client (Version 2.17.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@


Name: yast2-nfs-client
-Version: 2.17.6
+Version: 2.17.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nfs-client-2.17.6.tar.bz2
+Source0: yast2-nfs-client-2.17.8.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
#ag_showexports moved to yast2 base
@@ -53,7 +53,7 @@
Martin Vidner <mvidner@xxxxxxx>

%prep
-%setup -n yast2-nfs-client-2.17.6
+%setup -n yast2-nfs-client-2.17.8

%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,8 +92,19 @@
%{prefix}/share/applications/YaST2/nfs.desktop
%doc %{prefix}/share/doc/packages/yast2-nfs-client
/usr/share/YaST2/schema/autoyast/rnc/nfs.rnc
-
%changelog
+* Fri Oct 31 2008 kmachalkova@xxxxxxx
+- Pass no data to the partitioner if the user decides to cancel
+ add/edit/delete NFS share operation
+- Correct AY backwards compatibility code if 'vfstype' key is missing
+ on Import - assume plain nfs in that case (bnc#438497)
+- 2.17.8
+* Wed Oct 29 2008 kmachalkova@xxxxxxx
+- Correct enabling/disabling of edit and delete buttons depending
+ on # of NFS shares (bnc#438665)
+- Initialize only non-fstab NFS settings (firewall, sysconfig, idmapd)
+ if the client is run embedded in the partitioner (bnc#436897)
+- 2.17.7
* Mon Oct 20 2008 kmachalkova@xxxxxxx
- Un-HTML-ize help text (bnc#432800)
- ag_showexports (+ related scrconf file) moved to yast2 base
@@ -309,7 +320,7 @@
* Mon Aug 26 2002 mvidner@xxxxxxx
- Make "yast2 nfs-client" invoke "yast2 nfs" (#17570).
- 2.6.11
-* Mon Aug 12 2002 mvidner@xxxxxxx
+* Sun Aug 11 2002 mvidner@xxxxxxx
- Let the table keep the keyboard focus (#16116 workaround).
- Fixed autoyast writing (nashif).
- 2.6.10

++++++ yast2-nfs-client-2.17.6.tar.bz2 -> yast2-nfs-client-2.17.8.tar.bz2 ++++++
++++ 3299 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-nfs-client-2.17.6/configure.in
new/yast2-nfs-client-2.17.8/configure.in
--- old/yast2-nfs-client-2.17.6/configure.in 2008-04-14 19:16:15.000000000
+0200
+++ new/yast2-nfs-client-2.17.8/configure.in 2008-10-29 15:30:01.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-nfs-client
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - 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-client, 2.16.0, http://bugs.opensuse.org/, yast2-nfs-client)
+AC_INIT(yast2-nfs-client, 2.17.6, http://bugs.opensuse.org/, yast2-nfs-client)
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.16.0"
+VERSION="2.17.6"
RPMNAME="yast2-nfs-client"
MAINTAINER="Katarina Machalkova <kmachalkova@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-nfs-client-2.17.6/src/nfs-client4part.ycp
new/yast2-nfs-client-2.17.8/src/nfs-client4part.ycp
--- old/yast2-nfs-client-2.17.6/src/nfs-client4part.ycp 2008-10-20
10:53:52.000000000 +0200
+++ new/yast2-nfs-client-2.17.8/src/nfs-client4part.ycp 2008-10-31
13:49:21.000000000 +0100
@@ -28,12 +28,15 @@

map <string, any> ToStorage ( map <string, any> entry )
{
+ map <string, any> ret = $[];

- return ( $[
+ if (entry != nil && entry != $[])
+ ret = $[
"device" : entry["spec"]:"",
"mount" : entry["file"]:"",
"fstopt" : entry["mntops"]:""
- ]);
+ ];
+ return ret;
}

if (func == "CreateUI")
@@ -56,18 +59,22 @@
"mntops": entry["fstopt"]:""
]);
});
- y2milestone("jezibaba %1", Nfs::nfs_entries);
+ y2milestone("Nfs shares imported from storage %1", Nfs::nfs_entries);
nfs_entries = Nfs::nfs_entries;
InitFstabEntries();

}
+ else if (func == "Read")
+ {
+ Nfs::skip_fstab = true;
+ Nfs::Read();
+ }
else if (func == "HandleEvent")
{
any widget_id = param["widget_id"]:nil;
list <symbol> w_ids = [ `newbut, `editbut, `delbut ];

HandleEvent( widget_id);
- y2milestone("jezibaba %1", nfs_entries);
y2milestone("%1", modify_line);
Nfs::nfs_entries = nfs_entries;

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-nfs-client-2.17.6/src/Nfs.ycp new/yast2-nfs-client-2.17.8/src/Nfs.ycp
--- old/yast2-nfs-client-2.17.6/src/Nfs.ycp 2008-09-23 13:04:07.000000000
+0200
+++ new/yast2-nfs-client-2.17.8/src/Nfs.ycp 2008-10-31 16:45:04.000000000
+0100
@@ -13,7 +13,7 @@
* Dan Vesely <dan@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: Nfs.ycp 51341 2008-09-19 16:44:21Z kmachalkova $
+ * $Id: Nfs.ycp 52807 2008-10-31 15:45:04Z kmachalkova $
*/

{
@@ -36,6 +36,9 @@
/* default value of settings modified */
global boolean modified = false;

+ /* Should fstab reading be skipped ? (yes if we're
+ embedded in partitioner) */
+ global boolean skip_fstab = false;

/**
* Function sets internal variable, which indicates, that any
@@ -104,7 +107,7 @@
global define boolean Import (list<map> settings) ``{

boolean missing = false;
- foreach(map s,settings,``{
+ settings = maplist(map s,settings,``{
foreach (string k, ["server_path", "mount_point", "nfs_options"],
``{
if (! haskey (s, k))
{
@@ -121,6 +124,7 @@
{
s["vfstype"] = "nfs";
}
+ return s;

});
if (missing)
@@ -128,7 +132,6 @@
return false;
}

-
Set(settings);
return true;
}
@@ -245,22 +248,29 @@
* @return true on success
*/
global define boolean Read () ``{
- list<map<string,any> > fstab = (list<map<string,any> >) SCR::Read
(.etc.fstab);
- fstab = UnescapeSpaces (fstab);
- y2milestone ("fstab: %1", fstab);

- // For simplicity, this leaves also the unused fileds in the maps.
- nfs_entries = filter (map<string,any> entry, fstab, ``{
- return (entry["vfstype"]:"" == "nfs" || entry["vfstype"]:"" ==
"nfs4");
- });
- non_nfs_entries = filter (map entry, fstab, ``{
- return (entry["vfstype"]:"" != "nfs");
- });
+ //Read /etc/fstab if we're running standalone (otherwise, libstorage
does the job)
+ if( !skip_fstab )
+ {
+ list<map<string,any> > fstab = (list<map<string,any> >) SCR::Read
(.etc.fstab);
+ fstab = UnescapeSpaces (fstab);
+ y2milestone ("fstab: %1", fstab);
+
+ // For simplicity, this leaves also the unused fileds in the maps.
+ nfs_entries = filter (map<string,any> entry, fstab, ``{
+ return (entry["vfstype"]:"" == "nfs" || entry["vfstype"]:"" ==
"nfs4");
+ });
+ non_nfs_entries = filter (map entry, fstab, ``{
+ return (entry["vfstype"]:"" != "nfs");
+ });
+ }

nfs4_enabled = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
idmapd_domain = (string) SCR::Read(.etc.idmapd_conf, "Domain");

+ boolean progress_orig = Progress::set(false);
SuSEFirewall::Read ();
+ Progress::set(progress_orig);

portmapper = FindPortmapper();
//There is neither rpcbind nor portmap
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-nfs-client-2.17.6/src/ui.ycp new/yast2-nfs-client-2.17.8/src/ui.ycp
--- old/yast2-nfs-client-2.17.6/src/ui.ycp 2008-10-20 12:09:41.000000000
+0200
+++ new/yast2-nfs-client-2.17.8/src/ui.ycp 2008-10-31 13:29:49.000000000
+0100
@@ -13,7 +13,7 @@
* Dan Vesely <dan@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: ui.ycp 52358 2008-10-20 10:09:05Z kmachalkova $
+ * $Id: ui.ycp 52680 2008-10-29 15:05:10Z kmachalkova $
*
* Network NFS client dialogs
*
@@ -431,6 +431,12 @@
specific <b>NFSv4 Domain Name</b>, required for correct setting of
file/directory access
rights.</p>") + fw_cwm_widget["help"]:"";

+ void EnableDisableButtons()
+ {
+ UI::ChangeWidget(`id(`editbut), `Enabled, ( nfs_entries != [] ) );
+ UI::ChangeWidget(`id(`delbut), `Enabled, ( nfs_entries != [] ) );
+ }
+
term FstabTab()
{
term fstab_content =
@@ -496,10 +502,7 @@
void InitFstabEntries( )
{
UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
-
- integer entryno = (integer) UI::QueryWidget(`id(`fstable),
`CurrentItem);
- UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil);
- UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil);
+ EnableDisableButtons();

// Kludge, because a `Table still does not have a shortcut.
// Simple to solve here: there's only the table and buttons,
@@ -545,11 +548,13 @@
map<string,any> entry = GetFstabEntry (nil, (list<map>) union
(Nfs::non_nfs_entries, nfs_entries));

if (entry != nil)
- {
+ {
nfs_entries = add (nfs_entries, entry);
modify_line = entry;
+ EnableDisableButtons();
+
Nfs::SetModified();
- }
+ }

UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
}
@@ -581,7 +586,9 @@
modify_line = share;
nfs_entries = remove (nfs_entries, entryno);
UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
- Nfs::SetModified();
+ EnableDisableButtons();
+
+ Nfs::SetModified();
}
}
else if (widget == `enable_nfs4)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-nfs-client-2.17.6/VERSION new/yast2-nfs-client-2.17.8/VERSION
--- old/yast2-nfs-client-2.17.6/VERSION 2008-10-20 12:51:32.000000000 +0200
+++ new/yast2-nfs-client-2.17.8/VERSION 2008-11-03 10:43:30.000000000 +0100
@@ -1 +1 @@
-2.17.6
+2.17.8


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread