Hello community,
here is the log from the commit of package autoyast2
checked in at Thu Sep 4 23:11:21 CEST 2008.
--------
--- autoyast2/autoyast2.changes 2008-09-02 17:22:47.000000000 +0200
+++ autoyast2/autoyast2.changes 2008-09-03 17:07:27.051622000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 3 17:05:05 CEST 2008 - ug(a)suse.de
+
+- cloning of software and partitioning is optional now
+- list of modules to clone is sorted now
+- 2.17.8
+
+-------------------------------------------------------------------
+Wed Sep 3 16:56:58 CEST 2008 - ug(a)suse.de
+
+- relurl for file_location added
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.f16014/_old 2008-09-04 23:09:25.000000000 +0200
+++ /var/tmp/diff_new_pack.f16014/_new 2008-09-04 23:09:25.000000000 +0200
@@ -21,7 +21,7 @@
Name: autoyast2
Version: 2.17.7
-Release: 1
+Release: 3
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,7 +62,7 @@
%package installation
License: GPL v2 or later
Version: 2.17.7
-Release: 1
+Release: 3
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
# API for Disabled Modules (ProductControl)
@@ -235,6 +235,12 @@
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
%changelog
+* Wed Sep 03 2008 ug(a)suse.de
+- cloning of software and partitioning is optional now
+- list of modules to clone is sorted now
+- 2.17.8
+* Wed Sep 03 2008 ug(a)suse.de
+- relurl for file_location added
* Tue Sep 02 2008 ug(a)suse.de
- Read() button added to UI
- UI changes
++++++ autoyast2-2.17.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.7/src/include/conftree.ycp new/autoyast2-2.17.7/src/include/conftree.ycp
--- old/autoyast2-2.17.7/src/include/conftree.ycp 2008-09-02 17:12:23.000000000 +0200
+++ new/autoyast2-2.17.7/src/include/conftree.ycp 2008-09-03 16:59:10.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: conftree.ycp 50584 2008-09-02 15:13:14Z ug $
+ * $Id: conftree.ycp 50627 2008-09-03 15:00:14Z ug $
*/
{
@@ -22,6 +22,7 @@
import "Stage";
import "Icon";
import "AutoinstSoftware";
+ import "AutoinstClone";
string title = _("Autoinstallation - Configuration");
@@ -190,7 +191,9 @@
/* enable disable read button */
map resourceMap = Y2ModuleConfig::ModuleMap[selectedModule]:$[];
boolean clonable = resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" == "true";
- if( ! clonable ){
+ if( ! clonable &&
+ "software" != selectedModule &&
+ "partitioning" != selectedModule ){
UI::ChangeWidget(`id(`read), `Enabled, false );
}
}
@@ -263,10 +266,19 @@
boolean readModule(string module_name){
map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[];
string auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"";
-
- Call::Function(auto , ["Read"]);
- Call::Function(auto , ["SetModified"]);
- Profile:prepare = true;
+ if( module_name == "software" ){
+ Call::Function("software_auto" , ["Import", AutoinstClone::Software()]);
+ Call::Function("software_auto" , ["SetModified"]);
+ }
+ else if( module_name == "partitioning" ){
+ Call::Function("storage_auto" , ["Import", AutoinstClone::Partitioning()]);
+ Call::Function("storage_auto" , ["SetModified"]);
+ }
+ else{
+ Call::Function(auto , ["Read"]);
+ Call::Function(auto , ["SetModified"]);
+ }
+ Profile::prepare = true;
return true;
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.7/src/modules/AutoinstClone.ycp new/autoyast2-2.17.7/src/modules/AutoinstClone.ycp
--- old/autoyast2-2.17.7/src/modules/AutoinstClone.ycp 2008-09-02 17:12:23.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstClone.ycp 2008-09-03 16:59:10.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif <nashif(a)suse.de>
*
- * $Id: AutoinstClone.ycp 50584 2008-09-02 15:13:14Z ug $
+ * $Id: AutoinstClone.ycp 50627 2008-09-03 15:00:14Z ug $
*
*
*/
@@ -51,7 +51,7 @@
*/
global define void AutoinstClone()
{
- Mode::SetMode ("normal");
+ //Mode::SetMode ("normal");
return;
}
@@ -524,7 +524,9 @@
foreach(string def_resource, map resourceMap, Y2ModuleConfig::ModuleMap, ``{
y2debug("r: %1 => %2", def_resource, resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" );
boolean clonable = ( resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" == "true" );
- if (clonable)
+ if ( clonable ||
+ "partitioning" == def_resource || /* has no desktop file */
+ "software" == def_resource ) /* has no desktop file */
{
// Set resource name, if not using default value
string resource = resourceMap["X-SuSE-YaST-AutoInstResource"]:"";
@@ -541,6 +543,11 @@
}
}
});
+ /* sort items for nicer display */
+ items = sort( term x, term y, (list<term>) items, {
+ /* x[1] corresponds to name */
+ return x[1]:"x" < y[1]:"y";
+ });
return items;
}
@@ -560,18 +567,24 @@
if (resource == "")
resource = def_resource;
y2debug("current resource: %1", resource);
- if (contains(additional, resource))
+ if (contains(additional, resource) &&
+ "partitioning" != resource && /* handled below */
+ "software" != resource) /* handled below */
{
boolean ret = CommonClone(def_resource, resourceMap);
}
});
- Call::Function("storage_auto" , ["Import", Partitioning()]);
- Call::Function("storage_auto" , ["SetModified"]);
-
- Call::Function("software_auto" , ["Import", Software()]);
- Call::Function("software_auto" , ["SetModified"]);
+ if( contains(additional, "partitioning")){
+ Call::Function("storage_auto" , ["Import", Partitioning()]);
+ Call::Function("storage_auto" , ["SetModified"]);
+ }
+
+ if( contains(additional, "software")){
+ Call::Function("software_auto" , ["Import", Software()]);
+ Call::Function("software_auto" , ["SetModified"]);
+ }
Call::Function("general_auto" , ["Import", General()]);
Call::Function("general_auto" , ["SetModified"]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.7/src/modules/AutoinstFile.ycp new/autoyast2-2.17.7/src/modules/AutoinstFile.ycp
--- old/autoyast2-2.17.7/src/modules/AutoinstFile.ycp 2008-09-02 14:24:11.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstFile.ycp 2008-09-03 16:57:24.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Anas Nashif (nashif(a)suse.de)
* Summary: Handle complete configuration file dumps
*
- * $Id: AutoinstFile.ycp 50568 2008-09-02 12:25:24Z ug $
+ * $Id: AutoinstFile.ycp 50626 2008-09-03 14:58:41Z ug $
*/
{
module "AutoinstFile";
@@ -106,6 +106,22 @@
SCR::Write (.target.string, file["file_path"]:alternate_location , file["file_contents"]:"");
} else if( file["file_location"]:"" != "" ) {
+ if( issubstring( file["file_location"]:"", "relurl://" ) ) {
+ string l = file["file_location"]:"";
+ l = substring ( l, 9 );
+ string newloc = "";
+ if( AutoinstConfig::scheme == "relurl" ) {
+ y2milestone("autoyast profile was relurl too");
+ newloc = (string)SCR::Read(.etc.install_inf.ayrelurl);
+ map tok = URL::Parse(newloc);
+ y2milestone("tok = %1", tok);
+ newloc = tok["scheme"]:"" + "://" + tok["host"]:"" + "/" + dirname(tok["path"]:"") + l;
+ } else {
+ newloc = AutoinstConfig::scheme + "://" + AutoinstConfig::host + "/" + AutoinstConfig::directory + l;
+ }
+ file["file_location"] = newloc;
+ y2milestone("changed relurl to %1 for file", newloc);
+ }
y2milestone("trying to get file from %1 storing in %2", file["file_location"]:"", file["file_path"]:alternate_location);
if (!GetURL(file["file_location"]:"", file["file_path"]:alternate_location ) ) {
y2error("file could not be retrieved");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.7/src/modules/ProfileLocation.ycp new/autoyast2-2.17.7/src/modules/ProfileLocation.ycp
--- old/autoyast2-2.17.7/src/modules/ProfileLocation.ycp 2008-01-17 16:21:22.000000000 +0100
+++ new/autoyast2-2.17.7/src/modules/ProfileLocation.ycp 2008-09-03 16:57:24.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Process Auto-Installation Location
* Author: Anas Nashif <nashif(a)suse.de>
*
- * $Id: ProfileLocation.ycp 43718 2008-01-17 15:21:22Z ug $
+ * $Id: ProfileLocation.ycp 50626 2008-09-03 14:58:41Z ug $
*/
{
module "ProfileLocation";
@@ -74,6 +74,8 @@
}
y2milestone("relurl for profile changed to: %1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath);
+ SCR::Write ( .etc.install_inf.ayrelurl, sformat("%1://%2/%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath) );
+ SCR::Write (.etc.install_inf, nil);
}
string filename = basename(AutoinstConfig::filepath);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
