October 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62557 - in /branches/tmp/jsrain/unattended-migration/installation/control: control.SLED.xml control.SLES.xml
by jsrain＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: jsrain Date: Thu Oct 7 09:04:35 2010 New Revision: 62557 URL: http://svn.opensuse.org/viewcvs/yast?rev=62557&view=rev Log: updated workflow Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml (original) +++ branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml Thu Oct 7 09:04:35 2010 @@ -467,7 +467,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -746,6 +746,7 @@ </modules> </workflow> +  <workflow> <defaults> <archs>all</archs> @@ -754,111 +755,26 @@ <mode>update</mode> <stage>initial</stage> <modules config:type="list"> - <module> - <name>complex_welcome</name> - <label>Welcome</label> - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - <arguments> - <first_run>yes</first_run> - </arguments> - <retranslate config:type="boolean">true</retranslate> - </module> - <module> - <label>Welcome</label> - <name>checkmedia</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Disk Activation</label> - <name>disks_activate</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>system_analysis</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>mode</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System for Update</label> - <name>update_partition</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> </module> <module> - <name>upgrade_urls</name> - <enable_back>yes</enable_back> - </module> - <module> - <label>Add-On Products</label> - <name>add-on</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> <heading>yes</heading> <label>Update</label> </module> <module> - <label>Update Summary</label> - <name>lilo_convert</name> - <execute>inst_lilo_convert</execute> - </module> - <module> - <label>Update Summary</label> - <name>inital_update_proposal</name> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> <execute>inst_proposal</execute> <proposal>initial</proposal> - </module> -  - <module> - <label>Perform Update</label> - <name>bl_preupdate</name> - <execute>bootloader_preupdate</execute> - </module> -  - <module> - <label>Perform Update</label> - <name>prepareprogress</name> - </module> - - <module> - <label>Perform Update</label> - <name>do_resize</name> - <update config:type="boolean">false</update> - <archs>i386,x86_64,ia64</archs> - </module> - <module> - <label>Perform Update</label> - <name>prepdisk</name> - </module> - <module> - <label>Perform Update</label> - <name>kickoff</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> </module> <module> <label>Perform Update</label> <name>rpmcopy</name> </module> - <module> - <label>Perform Update</label> - <name>finish</name> - </module> </modules> </workflow> @@ -1281,6 +1197,142 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + + + <module> + <heading>yes</heading> + <label>Update</label> + </module> + + + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + +  + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> +  + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1312,6 +1364,72 @@ </module> </modules> </workflow> + +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>update</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> </workflows> </productDefines> Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml (original) +++ branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml Thu Oct 7 09:04:35 2010 @@ -886,6 +886,7 @@ </modules> </workflow> +  <workflow> <defaults> <archs>all</archs> @@ -894,117 +895,26 @@ <mode>update</mode> <stage>initial</stage> <modules config:type="list"> - <module> - <name>complex_welcome</name> - <label>Welcome</label> - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - <arguments> - <first_run>yes</first_run> - </arguments> - <retranslate config:type="boolean">true</retranslate> - </module> - <module> - <label>Welcome</label> - <name>checkmedia</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Disk Activation</label> - <name>disks_activate</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>system_analysis</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>mode</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System for Update</label> - <name>update_partition</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> </module> <module> - <name>upgrade_urls</name> - <enable_back>yes</enable_back> - </module> - <module> - <label>Add-On Products</label> - <name>add-on</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> <heading>yes</heading> <label>Update</label> </module> <module> - <label>Update Summary</label> - <name>lilo_convert</name> - <execute>inst_lilo_convert</execute> - </module> - <module> - <label>Update Summary</label> + <label>AutoYaST Settings</label> <name>initial_update_proposal</name> <execute>inst_proposal</execute> <proposal>initial</proposal> - </module> -  - <module> - <label>Perform Update</label> - <name>bl_preupdate</name> - <execute>bootloader_preupdate</execute> - </module> -  - <module> - <label>Perform Update</label> - <name>prepareprogress</name> - </module> - - <module> - <label>Perform Update</label> - <name>do_resize</name> - <update config:type="boolean">false</update> - <archs>i386,x86_64,ia64</archs> - </module> - <module> - <label>Perform Update</label> - <name>prepdisk</name> - </module> - <module> - <label>Perform Update</label> - <name>kickoff</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> </module> <module> <label>Perform Update</label> <name>rpmcopy</name> </module> - <module> -  - <label>Perform Update</label> - <name>reiplauto</name> - <archs>s390</archs> - </module> - <module> - <label>Perform Update</label> - <name>finish</name> - </module> </modules> </workflow> @@ -1123,103 +1033,6 @@ <workflow> <stage>continue</stage> - <mode>update</mode> - <defaults> - <archs>all</archs> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </defaults> - <modules config:type="list"> - <module> - <label>Perform Update</label> - <name>rpmcopy_secondstage</name> - </module> - <module> - <heading>yes</heading> - <label>Configuration</label> - </module> - <module> - <label>Network</label> - <name>ask_net_test</name> -  - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Network</label> - <name>do_net_test</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Customer Center</label> - <name>addon_update_sources</name> - </module> - <module> - <label>Customer Center</label> - <name>suse_register</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>ask_online_update</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>you</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>restore_settings</name> - </module> - <module> - <label>Clean Up</label> - <name>suseconfig</name> - </module> - <module> - <label>Release Notes</label> - <name>release_notes</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - -  - <module> -  - <name>congratulate_all_archs</name> - <execute>inst_congratulate</execute> - <archs>i386,x86_64,ia64,ppc,ppc64</archs> - <arguments> - <show_zmd_turnoff_checkbox>yes</show_zmd_turnoff_checkbox> - <zmd_turnoff_default_state>no</zmd_turnoff_default_state> - </arguments> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> -  - <module> -  - <name>congratulate_s390_archs</name> - <execute>inst_congratulate</execute> - <archs>s390,s390x</archs> - <arguments> - <show_zmd_turnoff_checkbox>yes</show_zmd_turnoff_checkbox> - <zmd_turnoff_default_state>yes</zmd_turnoff_default_state> - </arguments> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - - </modules> - </workflow> - - <workflow> - <stage>continue</stage> <mode>installation</mode> <defaults> <enable_back>yes</enable_back> @@ -1595,7 +1408,6 @@ </modules> </workflow> - <workflow> <defaults> <archs>all</archs> @@ -1632,5 +1444,72 @@ </modules> </workflow> +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>update</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62556 - /tags/branch-SLE-10-SP4-2_13_20/instserver/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 21:52:32 2010 New Revision: 62556 URL: http://svn.opensuse.org/viewcvs/yast?rev=62556&view=rev Log: Created tag branch-SLE-10-SP4-2_13_20 for instserver Added: tags/branch-SLE-10-SP4-2_13_20/instserver/ - copied from r62555, branches/SuSE-SLE-10-SP4-Branch/instserver/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62555 - /tags/branch-SLE-10-SP4-2_13_20/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 21:52:28 2010 New Revision: 62555 URL: http://svn.opensuse.org/viewcvs/yast?rev=62555&view=rev Log: Created tag branch-SLE-10-SP4-2_13_20 Added: tags/branch-SLE-10-SP4-2_13_20/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62554 - in /branches/SuSE-SLE-10-SP4-Branch/instserver: VERSION package/yast2-instserver.changes src/Instserver.ycp
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 21:24:11 2010 New Revision: 62554 URL: http://svn.opensuse.org/viewcvs/yast?rev=62554&view=rev Log: - fixed creating SLP reg. files: fixed writing architectures, fixed reescaping already escaped values (bnc#492367) - 2.13.20 Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/instse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION Wed Oct 6 21:24:11 2010 @@ -1 +1 @@ -2.13.19 +2.13.20 Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/instse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes Wed Oct 6 21:24:11 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 6 19:16:34 UTC 2010 - lslezak(a)suse.cz + +- fixed creating SLP reg. files: fixed writing architectures, + fixed reescaping already escaped values (bnc#492367) +- 2.13.20 + +------------------------------------------------------------------- Wed Jul 8 16:21:36 CEST 2009 - lslezak(a)suse.cz - check the network service status at startup (bnc#308662) Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/instse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp Wed Oct 6 21:24:11 2010 @@ -523,6 +523,76 @@ return ret; } +string subreplace(string text, string in, string out) +{ + list<string> parts = splitstring(text, "\\"); + + // don't modify the first item, it's the non-matched prefix + boolean first = true; + list<string> new_parts = maplist(string p, parts, + { + if (first) + { + first = false; + return p; + } + + string new_part = p; + + if (in == substring(p, 0, 2)) + { + new_part = out + substring(p, 2); + } + else + { + // put the backslash back if the remaining part doesn't match + new_part = "\\" + p; + } + + return new_part; + } + ); + + string ret = mergestring(new_parts, ""); + y2debug("unescaped str: text: %1, in: %2, out: %3 => %4", text, in, out, ret); + + return ret; +} + +// this is an oppsite function to EscapeSLPData() +// it takes SLP input and unescpaes the backslash sequences +map<string, string> UnEscapeSLPData(map<string, string> a) +{ + map<string, string> ret = $[]; + + foreach(string key, string value, a, + { + // String::Replace() enters endless loop in '\' -> '\5c' conversion + // use splitstring() and mergestring() builtins instead + string new_key = key; + new_key = subreplace(new_key, "2e", "."); + new_key = subreplace(new_key, "3d", "="); + new_key = subreplace(new_key, "23", "#"); + new_key = subreplace(new_key, "3b", ";"); + new_key = subreplace(new_key, "5c", "\\"); + + string new_value = value; + new_value = subreplace(new_value, "28", "("); + new_value = subreplace(new_value, "29", ")"); + new_value = subreplace(new_value, "2c", ","); + new_value = subreplace(new_value, "23", "#"); + new_value = subreplace(new_value, "3b", ";"); + new_value = subreplace(new_value, "5c", "\\"); + + ret[new_key] = new_value; + } + ); + + y2milestone("Unescaped SLP attributes: %1 -> %2", a, ret); + + return ret; +} + /* * Return the IP address of the local machine * @return string IP Address @@ -555,6 +625,48 @@ return hostname; } +list<string> basearch_mapping(string basearch) +{ + map<string,list<string> > mapping = $[ + "i586" : [ "i586", "i686" ], + "mips" : [ "mips", "mips64" ], + "ppc" : [ "ppc", "ppc64" ], + "sparc" : [ "sparc", "sparc64"], + "x86_64" : [ "x86_64"] + ]; + + if (!haskey(mapping, basearch)) + { + y2warning("Unknown BASEARCH: %1", basearch); + } + + // return the original basearch if mapping is unknown + list<string> ret = mapping[basearch]:[basearch]; + + y2milestone("Using BASEARCH mapping: %1 -> %2", basearch, ret); + + return ret; +} + +list<string> get_machines(string basearch_value) +{ + list<string> archs = splitstring(basearch_value, " "); + archs = filter(string a, archs, {return a != nil && a != "";}); + + list<string> ret = []; + + foreach(string a, archs, + { + ret = (list<string>)merge(ret, basearch_mapping(a)); + } + ); + + y2milestone("Final BASEARCH mapping: %1", ret); + + return ret; +} + + /** * Write SLP configuration */ @@ -630,21 +742,38 @@ string machine = ""; list<string> machines = []; foreach(string k, any v, cm, ``{ - if (issubstring(k, "ARCH")) + y2debug("Read Key: '%1'", k); + + if (k == "BASEARCHS") + { + // machine mapping + machines = get_machines((string)v); + } + else if (issubstring(k, "ARCH")) { - machines = (list<string>)union (machines, splitstring((string)v, " ") ); + string a = regexpsub(k, "ARCH\\.(.*)", "\\1"); + + if (a != nil) + { + y2milestone("Found %1 key, adding arch %2 to the list", k, a); + machines = add(machines, a); + } } }); machines = filter(string m , machines, ``(m!="" && m!="noarch")); machines = toset(machines); + + // sort the list so it looks better + machines = sort(machines); + string machines_string = mergestring(machines, ","); + y2debug("machines: %1", machines); - attr["machine"] = mergestring(machines, ","); - y2debug("machine: %1", machine); // preserve the old configuration if (SCR::Read(.target.size, read_file) >= 0) { y2milestone("Existing reg.d file found: %1", read_file); + map<string, string> old_attr = $[]; string reg_cont = (string)SCR::Read(.target.string, read_file); list<string> lines = splitstring(reg_cont, "\n"); @@ -656,11 +785,24 @@ if (parsed_name != nil) { y2milestone("Reusing attribute: %1=%2", parsed_name, parsed_value); - attr[parsed_name] = parsed_value; + old_attr[parsed_name] = parsed_value; } } ); + // unescape the read value + old_attr = UnEscapeSLPData(old_attr); + + if (haskey(old_attr, "machine")) + { + // backup the "machine" value + machines_string = old_attr["machine"]:""; + } + + // merge them with read values, + // keep the original setting if a value was already set + attr = (map<string, string>)union(attr, old_attr); + /* TODO: checking? // don't check the overwritten config file @@ -678,6 +820,11 @@ // escape invalid characters attr = EscapeSLPData(attr); + // replace the machine option after escaping, + // it actually _is_ a list so "," is valid here + attr["machine"] = machines_string; + y2milestone("machine: %1", attr["machine"]:""); + y2milestone("registering SLP service: serv: %1, attr: %2, regfile: %3", serv, attr, regfile); boolean ret = SLP::RegFile(serv, attr, regfile ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62553 - /tags/branch-SLE-10-SP4-2_13_117/yast2/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:09:06 2010 New Revision: 62553 URL: http://svn.opensuse.org/viewcvs/yast?rev=62553&view=rev Log: Created tag branch-SLE-10-SP4-2_13_117 for yast2 Added: tags/branch-SLE-10-SP4-2_13_117/yast2/ (props changed) - copied from r62552, branches/SuSE-SLE-10-SP4-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62552 - /tags/branch-SLE-10-SP4-2_13_117/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:09:04 2010 New Revision: 62552 URL: http://svn.opensuse.org/viewcvs/yast?rev=62552&view=rev Log: Created tag branch-SLE-10-SP4-2_13_117 Added: tags/branch-SLE-10-SP4-2_13_117/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62551 - /tags/branch-SLE-10-SP4-2_13_186/packager/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:08:52 2010 New Revision: 62551 URL: http://svn.opensuse.org/viewcvs/yast?rev=62551&view=rev Log: Created tag branch-SLE-10-SP4-2_13_186 for packager Added: tags/branch-SLE-10-SP4-2_13_186/packager/ (props changed) - copied from r62550, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62550 - /tags/branch-SLE-10-SP4-2_13_186/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:08:50 2010 New Revision: 62550 URL: http://svn.opensuse.org/viewcvs/yast?rev=62550&view=rev Log: Created tag branch-SLE-10-SP4-2_13_186 Added: tags/branch-SLE-10-SP4-2_13_186/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62549 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/modules/InstURL.ycp
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:08:16 2010 New Revision: 62549 URL: http://svn.opensuse.org/viewcvs/yast?rev=62549&view=rev Log: - put the Linuxrc CD/DVD device to the beginning of the CD/DVD device list - prefer the Linuxrc medium (bnc#588830) - 2.13.186 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Wed Oct 6 20:08:16 2010 @@ -1 +1 @@ -2.13.185 +2.13.186 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Wed Oct 6 20:08:16 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 6 17:48:40 UTC 2010 - lslezak(a)suse.cz + +- put the Linuxrc CD/DVD device to the beginning of the CD/DVD + device list - prefer the Linuxrc medium (bnc#588830) +- 2.13.186 + +------------------------------------------------------------------- Fri Jul 24 08:43:26 CEST 2009 - lslezak(a)suse.cz - fixed URL password logging into y2log (bnc#441944) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp Wed Oct 6 20:08:16 2010 @@ -58,6 +58,24 @@ if (size (ready) != 0) devlist = ready; + + // add the Linuxrc medium to the beginning + string cdrom = Linuxrc::InstallInf("Cdrom"); + if (cdrom != nil && cdrom != "") + { + y2milestone("Found CD/DVD device in /etc/install.inf: %1", cdrom); + string linuxrc_device = "/dev/" + cdrom; + y2milestone("Using Linuxrc device: %1", linuxrc_device); + + // remove the device if it is already in the list + devlist = filter(string d, devlist, {return d != linuxrc_device;}); + + // put the linuxrc device at the beginning + devlist = prepend(devlist, linuxrc_device); + + y2milestone("Using CD/DVD device list: %1", devlist); + } + foreach (string d, devlist, { if (d != "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62548 - in /branches/SuSE-SLE-10-SP4-Branch/yast2: VERSION library/types/src/URL.ycp library/types/testsuite/tests/URL.out package/yast2.changes
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 19:51:10 2010 New Revision: 62548 URL: http://svn.opensuse.org/viewcvs/yast?rev=62548&view=rev Log: - allow entering some symbols in passwords when adding a new repository (bnc#598836) - 2.13.117 Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION Wed Oct 6 19:51:10 2010 @@ -1 +1 @@ -2.13.116 +2.13.117 Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp Wed Oct 6 19:51:10 2010 @@ -38,17 +38,38 @@ * order (the first or the last) during processing */ global map<string, string> transform_map_passwd = $[ - ";":"%3b", - "/":"%2f", - "?":"%3f", - ":":"%3a", - "@":"%40", + " ":"%20", + "!":"%21", + "\"":"%22", + "#":"%23", + "$":"%24", "&":"%26", - "=":"%3d", + "'":"%27", + "(":"%28", + ")":"%29", + "*":"%2a", "+":"%2b", - "$":"%24", ",":"%2c", - " ":"%20" + "-":"%2d", + ".":"%2e", + "/":"%2f", + ":":"%3a", + ";":"%3b", + "<":"%3c", + "=":"%3d", + ">":"%3e", + "?":"%3f", + "@":"%40", + "[":"%5b", + "\\":"%5c", + "]":"%5d", + "^":"%5e", + "_":"%5f", + "`":"%60", + "{":"%7b", + "|":"%7c", + "}":"%7d", + "~":"%7e" ]; /** @@ -289,6 +310,7 @@ if (size(userpass) != 0 && tokens["pass"]:"" != "" ) { userpass = sformat("%1:%2", userpass, EscapeString(tokens["pass"]:"", transform_map_passwd) ); + y2debug("Escaped user and password: '%1' => '%2'", tokens["pass"]:"", userpass); } if (size(userpass) > 0 ) userpass = userpass + "@"; Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out Wed Oct 6 19:51:10 2010 @@ -5,7 +5,7 @@ Return abcd%25 Return ab%25c%24d Return %20%25%24%20 -Return _<>{} +Return %5f%3c%3e%7b%7d Return %25 Return Return Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes Wed Oct 6 19:51:10 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 6 16:51:13 UTC 2010 - lslezak(a)suse.cz + +- allow entering some symbols in passwords when adding a new + repository (bnc#598836) +- 2.13.117 + +------------------------------------------------------------------- Mon Mar 22 14:50:16 CET 2010 - mzugec(a)suse.cz - L3: autoinstallation with manual setup (bnc#568653) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0