commit yast2-packager

24 May 2007

Hello community,

here is the log from the commit of package yast2-packager
checked in at Fri May 25 00:45:37 CEST 2007.

--------

--- yast2-packager/yast2-packager.changes	2007-05-17 12:34:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes	2007-05-24 17:45:37.680173000 +0200
@@ -1,0 +2,12 @@
+Thu May 24 17:27:04 CEST 2007 - lslezak@suse.cz
+
+- install 'portmap' package if installing from a NFS source
+  (#277813)
+- 2.15.41 
+
+-------------------------------------------------------------------
+Mon May 21 13:59:38 CEST 2007 - jsrain@suse.cz
+
+- check if host name specified is valid (#232887)
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-2.15.40.tar.bz2

New:
----
  yast2-packager-2.15.41.tar.bz2

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.hR5257/_old	2007-05-25 00:45:16.000000000 +0200
+++ /var/tmp/diff_new_pack.hR5257/_new	2007-05-25 00:45:16.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.15.40)
+# spec file for package yast2-packager (Version 2.15.41)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-packager
-Version:        2.15.40
+Version:        2.15.41
 Release:        1
 License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.15.40.tar.bz2
+Source0:        yast2-packager-2.15.41.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
 BuildRequires:  yast2 >= 2.15.22
@@ -49,7 +49,7 @@
     Arvin Schnell <arvin@suse.de>
 
 %prep
-%setup -n yast2-packager-2.15.40
+%setup -n yast2-packager-2.15.41
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -88,6 +88,12 @@
 %doc %{prefix}/share/doc/packages/yast2-packager
 
 %changelog
+* Thu May 24 2007 - lslezak@suse.cz
+- install 'portmap' package if installing from a NFS source
+  (#277813)
+- 2.15.41
+* Mon May 21 2007 - jsrain@suse.cz
+- check if host name specified is valid (#232887)
 * Thu May 17 2007 - locilka@suse.cz
 - Sort licenses alphabetically using an lsort instead of common
   sort builtin (#274747).

++++++ yast2-packager-2.15.40.tar.bz2 -> yast2-packager-2.15.41.tar.bz2 ++++++
++++ 5872 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-packager-2.15.40/configure.in new/yast2-packager-2.15.41/configure.in
--- old/yast2-packager-2.15.40/configure.in	2007-05-17 12:34:49.000000000 +0200
+++ new/yast2-packager-2.15.41/configure.in	2007-05-24 17:44:42.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-packager
 dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-packager, 2.15.39, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.41, http://bugs.opensuse.org/, yast2-packager)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.15.39"
+VERSION="2.15.41"
 RPMNAME="yast2-packager"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.40/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.41/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.40/src/modules/PackageCallbacks.ycp	2007-04-26 15:37:59.000000000 +0200
+++ new/yast2-packager-2.15.41/src/modules/PackageCallbacks.ycp	2007-05-24 14:15:46.000000000 +0200
@@ -7,7 +7,7 @@
  *
  * Purpose:		provides the default Callbacks for Pkg::
  *
- * $Id: PackageCallbacks.ycp 37735 2007-04-26 11:52:49Z lslezak $
+ * $Id: PackageCallbacks.ycp 38130 2007-05-24 12:15:45Z lslezak $
  *
  */
 
@@ -179,7 +179,7 @@
 
     /** during file providal
      *
-     // return "" for ignore
+     // return "I" for ignore
      // return "R" for retry
      // return "C" for abort
      */
@@ -201,7 +201,7 @@
 	if (provide_aborted)
 	{
 	    provide_aborted = false;
-	    return "CANCEL";
+	    return "C";
 	}
 
 	if (error != 0)
@@ -411,7 +411,7 @@
     /**
      *  After package install.
      *
-     *  return "" for ignore
+     *  return "I" for ignore
      *  return "R" for retry
      *  return "C" for abort (not implemented !)
      */
@@ -464,7 +464,7 @@
 		    }
 
 		    // otherwise return Ignore (default)
-		    return "";
+		    return "I";
 		}
 	    }
 	    else {
@@ -514,7 +514,7 @@
 	    // default: ignore
 	}
 
-	return "";
+	return "I";
     }
 
 
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-packager-2.15.40/src/modules/Packages.ycp new/yast2-packager-2.15.41/src/modules/Packages.ycp
--- old/yast2-packager-2.15.40/src/modules/Packages.ycp	2007-05-16 16:04:10.000000000 +0200
+++ new/yast2-packager-2.15.41/src/modules/Packages.ycp	2007-05-24 17:41:57.000000000 +0200
@@ -3,7 +3,7 @@
  * Package:	Package selections
  * Authors:	Anas Nashif <nashif@suse.de>
  *
- * $Id: Packages.ycp 38001 2007-05-16 14:04:08Z locilka $
+ * $Id: Packages.ycp 38134 2007-05-24 15:41:56Z lslezak $
  */
 
 {
@@ -133,6 +133,7 @@
     selected = filter (map<string,any> r, selected, {
 	return r["status"]:nil == `selected;
     });
+
     list<string> ret = maplist (map<string,any> r, selected, {
 	string disp = r["summary"]:r["name"]:"";
 	return sformat (format, disp);
@@ -552,6 +553,7 @@
      */
     list<string> sourceAccessPackages()
     {
+	// TODO: rather check all registered installation sources...
 	list<string> ret = [];
 
 	string instmode = Linuxrc::InstallInf("InstMode");
@@ -562,8 +564,13 @@
 	    // /sbin/mount.cifs is required to mount a SMB/CIFS share
 	    ret = ["cifs-mount"];
 	}
+	else if (instmode == "nfs")
+	{
+	    // portmap is required to mount an NFS export
+	    ret = ["portmap"];
+	}
 
-	y2milestone("Packages for access to the installation source: %1", ret);
+	y2milestone("Packages for accessing the installation source: %1", ret);
 
 	return ret;
     }
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-packager-2.15.40/src/modules/ProductLicense.ycp new/yast2-packager-2.15.41/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.15.40/src/modules/ProductLicense.ycp	2007-05-17 12:22:27.000000000 +0200
+++ new/yast2-packager-2.15.41/src/modules/ProductLicense.ycp	2007-05-24 17:31:29.000000000 +0200
@@ -66,8 +66,6 @@
 	lang_names_orig = $[];
     }
 
-    y2milestone ("L: %1", lang_names_orig);
-
     map<string,string> lang_names = $[];
 
     // $[ "en" : "English (US)", "de" : "Deutsch" ]
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-packager-2.15.40/src/modules/SourceDialogs.ycp new/yast2-packager-2.15.41/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.15.40/src/modules/SourceDialogs.ycp	2007-04-26 15:37:59.000000000 +0200
+++ new/yast2-packager-2.15.41/src/modules/SourceDialogs.ycp	2007-05-24 17:31:29.000000000 +0200
@@ -27,6 +27,7 @@
 import "Report";
 import "NetworkPopup";
 import "String";
+import "Hostname";
 
 // common functions / data
 
@@ -827,6 +828,19 @@
     }
 }
 
+boolean ServerValidate (string key, map event) {
+    string host = NormalizeHost ((string)UI::QueryWidget (`id (`server), `Value));
+    if (! Hostname::CheckFQ (host))
+    {
+	UI::SetFocus (`server);
+	Popup::Message (Hostname::ValidFQ ());
+	return false;
+    }
+
+    return true;
+}
+
+
 /**
  * Store function of a widget
  * @param key string widget key
@@ -898,6 +912,13 @@
 	    directory = directory + ";workgroup=" + workgroup;
     }
     parsed["path"] = directory;
+
+    // set HTTP/HTTPS port
+    if (type == `http || type == `https)
+    {
+	parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value);
+    }
+
     y2milestone("Entered URL: %1", parsed);
     _url = URL::Build (parsed);
     y2milestone("URL::Build: %1", _url);
@@ -908,11 +929,6 @@
 	    _url = PosprocessISOURL (_url);
     }
 
-    // set HTTP/HTTPS port
-    if (type == `http || type == `https)
-    {
-	parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value);
-    }
 }
 
 
@@ -935,6 +951,8 @@
 	    `ReplacePoint (`id (`server_rp), `Empty ())
 	),
 	"init" : ServerInit,
+	"validate_type" : `function,
+	"validate_function" : ServerValidate,
 	"store" : ServerStore,
 	"handle" : ServerHandle,
 // help text - server dialog
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-packager-2.15.40/src/modules/test_resolvables.ycp new/yast2-packager-2.15.41/src/modules/test_resolvables.ycp
--- old/yast2-packager-2.15.40/src/modules/test_resolvables.ycp	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.15.41/src/modules/test_resolvables.ycp	2007-05-24 17:15:37.000000000 +0200
@@ -0,0 +1,18 @@
+{
+    import "Wizard";
+
+    Wizard::CreateDialog ();
+
+    Pkg::TargetInit("/", false);
+    Pkg::SourceStartManager(true);
+
+//    WFM::CallFunction("inst_extrasources", []);
+
+    y2internal("Pkg::ResolvableProperties: %1", Pkg::ResolvableProperties("", `pattern, ""));
+
+//    Pkg::SourceSaveAll();
+//    Pkg::SourceFinishAll();
+//    Pkg::TargetFinish();
+//
+//    Wizard::CloseDialog ();
+}
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-packager-2.15.40/VERSION new/yast2-packager-2.15.41/VERSION
--- old/yast2-packager-2.15.40/VERSION	2007-05-17 12:48:04.000000000 +0200
+++ new/yast2-packager-2.15.41/VERSION	2007-05-24 17:30:24.000000000 +0200
@@ -1 +1 @@
-2.15.40
+2.15.41


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



Remember to have fun...

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

    

root＠Hilbert.suse.de

tags

participants (1)