January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55165 - /tags/branch-Code-11-2_17_1/restore/
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 12:51:10 2009 New Revision: 55165 URL: http://svn.opensuse.org/viewcvs/yast?rev=55165&view=rev Log: Hmm Removed: tags/branch-Code-11-2_17_1/restore/ -- 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] r55164 - /tags/branch-Code-11-2_17_1/restore/
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 12:50:24 2009 New Revision: 55164 URL: http://svn.opensuse.org/viewcvs/yast?rev=55164&view=rev Log: Created tag branch-Code-11-2_17_1 for restore Added: tags/branch-Code-11-2_17_1/restore/ - copied from r55163, branches/SuSE-Code-11-Branch/restore/ -- 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] r55163 - in /trunk/yast2: package/yast2.changes scripts/yast2-completion.sh
by jsrain＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: jsrain Date: Fri Jan 30 11:39:10 2009 New Revision: 55163 URL: http://svn.opensuse.org/viewcvs/yast?rev=55163&view=rev Log: fixed bash completion (bnc #470544) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2-completion.sh Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jan 30 11:39:10 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz + +- fixed bash completion (bnc #470544) + +------------------------------------------------------------------- Wed Jan 28 11:55:29 CET 2009 - lslezak(a)suse.cz - PackagesUI - removed textdomain switches Modified: trunk/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-completion.s… ============================================================================== --- trunk/yast2/scripts/yast2-completion.sh (original) +++ trunk/yast2/scripts/yast2-completion.sh Fri Jan 30 11:39:10 2009 @@ -18,7 +18,7 @@ fi cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then + if [[ ${#COMP_WORDS[@]} -ge 3 && $COMP_CWORD -ge 2 ]]; then prevprev=${COMP_WORDS[COMP_CWORD-2]} fi if [[ $cur == '-' ]]; then -- 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] r55162 - /tags/branch-Code-11-2_17_64/yast2/
by jsrain＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: jsrain Date: Fri Jan 30 11:31:47 2009 New Revision: 55162 URL: http://svn.opensuse.org/viewcvs/yast?rev=55162&view=rev Log: Created tag branch-Code-11-2_17_64 for yast2 Added: tags/branch-Code-11-2_17_64/yast2/ - copied from r55161, branches/SuSE-Code-11-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] r55161 - in /branches/SuSE-Code-11-Branch/yast2: VERSION package/yast2.changes scripts/yast2-completion.sh
by jsrain＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: jsrain Date: Fri Jan 30 11:31:38 2009 New Revision: 55161 URL: http://svn.opensuse.org/viewcvs/yast?rev=55161&view=rev Log: fixed bash completion (bnc #470544) Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Fri Jan 30 11:31:38 2009 @@ -1 +1 @@ -2.17.63 +2.17.64 Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Fri Jan 30 11:31:38 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz + +- fixed bash completion (bnc #470544) +- 2.17.64 + +------------------------------------------------------------------- Mon Jan 26 13:08:55 CET 2009 - locilka(a)suse.cz - Fixing ProductControl to avoid leaving a workflow by with the Modified: branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/scr… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh (original) +++ branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh Fri Jan 30 11:31:38 2009 @@ -18,7 +18,7 @@ fi cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then + if [[ ${#COMP_WORDS[@]} -ge 3 && $COMP_CWORD -ge 2 ]]; then prevprev=${COMP_WORDS[COMP_CWORD-2]} fi if [[ $cur == '-' ]]; then -- 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] r55160 - /tags/branch-Code-11-2_17_14/product-creator/
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:41:18 2009 New Revision: 55160 URL: http://svn.opensuse.org/viewcvs/yast?rev=55160&view=rev Log: Created tag branch-Code-11-2_17_14 for product-creator Added: tags/branch-Code-11-2_17_14/product-creator/ - copied from r55159, branches/SuSE-Code-11-Branch/product-creator/ -- 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] r55159 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes src/complex.ycp
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:28:04 2009 New Revision: 55159 URL: http://svn.opensuse.org/viewcvs/yast?rev=55159&view=rev Log: - unload all sources after changing a configuration to reset the internal state so the correct "cross-ppc-binutils" package is installed (bnc#469191) - 2.17.14 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Fri Jan 30 10:28:04 2009 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Fri Jan 30 10:28:04 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 30 09:21:09 CET 2009 - lslezak(a)suse.cz + +- unload all sources after changing a configuration to reset the + internal state so the correct "cross-ppc-binutils" package is + installed (bnc#469191) +- 2.17.14 + +------------------------------------------------------------------- Tue Jan 27 13:57:43 CET 2009 - lslezak(a)suse.cz - PPC boot files are optional (SLES11 does not contain 'inst32' Modified: branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Fri Jan 30 10:28:04 2009 @@ -159,6 +159,8 @@ while(true) { // reset the current architecture (needed when going back) ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); ret = UI::UserInput(); -- 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] r55158 - in /branches/SuSE-Code-11-Branch/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:27:25 2009 New Revision: 55158 URL: http://svn.opensuse.org/viewcvs/yast?rev=55158&view=rev Log: - PPC boot files are optional (SLES11 does not contain 'inst32' file) (bnc#469272) Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Fri Jan 30 10:27:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 13:57:43 CET 2009 - lslezak(a)suse.cz + +- PPC boot files are optional (SLES11 does not contain 'inst32' + file) (bnc#469272) + +------------------------------------------------------------------- Wed Nov 19 17:38:36 CET 2008 - lslezak(a)suse.cz - fixed creating cross-arch PPC product (cross-ppc-binutils, Modified: branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Fri Jan 30 10:27:25 2009 @@ -1071,7 +1071,7 @@ foreach(string f, files, { - CopyFile(srcid, 1, f, target + f); + CopyOptionalFile(srcid, 1, f, target + f); } ); } -- 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] r55157 - in /trunk/product-creator: package/yast2-product-creator.changes src/complex.ycp
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:26:26 2009 New Revision: 55157 URL: http://svn.opensuse.org/viewcvs/yast?rev=55157&view=rev Log: - unload all sources after changing a configuration to reset the internal state so the correct "cross-ppc-binutils" package is installed (bnc#469191) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Jan 30 10:26:26 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 30 09:21:09 CET 2009 - lslezak(a)suse.cz + +- unload all sources after changing a configuration to reset the + internal state so the correct "cross-ppc-binutils" package is + installed (bnc#469191) + +------------------------------------------------------------------- Tue Jan 27 13:57:43 CET 2009 - lslezak(a)suse.cz - PPC boot files are optional (SLES11 does not contain 'inst32' Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Fri Jan 30 10:26:26 2009 @@ -159,6 +159,8 @@ while(true) { // reset the current architecture (needed when going back) ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); ret = UI::UserInput(); -- 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] r55156 - in /branches/SuSE-Code-11-Branch/restore: VERSION package/yast2-restore.changes src/Restore.ycp src/summary_dialog.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 19:36:29 2009 New Revision: 55156 URL: http://svn.opensuse.org/viewcvs/yast?rev=55156&view=rev Log: - Fixed displaying i18n characters in summary (bnc #460674). - Save summary to file - huge speedup (bnc #460674). - 2.17.1 Modified: branches/SuSE-Code-11-Branch/restore/VERSION branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-Branch/restore/src/Restore.ycp branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp Modified: branches/SuSE-Code-11-Branch/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/V… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/VERSION (original) +++ branches/SuSE-Code-11-Branch/restore/VERSION Thu Jan 29 19:36:29 2009 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/p… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes Thu Jan 29 19:36:29 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 19:21:35 CET 2009 - locilka(a)suse.cz + +- Fixed displaying i18n characters in summary (bnc #460674). +- Save summary to file - huge speedup (bnc #460674). +- 2.17.1 + +------------------------------------------------------------------- Tue Dec 16 15:42:40 CET 2008 - locilka(a)suse.cz - Fixed alignment of buttons (bnc #447102). Modified: branches/SuSE-Code-11-Branch/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/s… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/src/Restore.ycp (original) +++ branches/SuSE-Code-11-Branch/restore/src/Restore.ycp Thu Jan 29 19:36:29 2009 @@ -972,7 +972,7 @@ infofiles = infofiles + (compressed_packages_info ? "info/packages_info.gz" : "info/packages_info"); // unpack info files - result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C " + tempdir + " -x -f " + filename + " " + infofiles + " 2> /dev/null"); + result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C '" + String::Quote (tempdir) + "' -x -f " + filename + " " + infofiles + " 2> /dev/null"); date = (string) SCR::Read(.target.string, tempdir + "/info/date"); comment = (string) SCR::Read(.target.string, tempdir + "/info/comment"); @@ -1460,6 +1460,10 @@ } ); + // BNC #460674, Do not change the system locale + // It can change I18N characters in output + string locale_modifications = "export LANG=C; "; + if (fileinarchive == "") { y2error("Can't find subarchive for package %1", package); @@ -1478,14 +1482,14 @@ } ); - string command = "export LC_ALL=C; echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; + string command = locale_modifications + "echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; y2debug("Running command: %1", command); started = (boolean) SCR::Execute(.background.run, command); } else { - started = (boolean) SCR::Execute(.background.run, "export LC_ALL=C; /bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); + started = (boolean) SCR::Execute(.background.run, locale_modifications + "/bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); } // abort test cycle @@ -1563,11 +1567,11 @@ // for tar: --files-from=filename // create (s)tar command - string tarcommand = (star == false) ? ("export LC_ALL=C; /bin/tar -C " + targetdir + " " + string tarcommand = (star == false) ? (locale_modifications + "/bin/tar -C " + targetdir + " " + compress + " -x -v -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout") - : ("export LC_ALL=C; /usr/bin/star -C " + targetdir + " " + : (locale_modifications + "/usr/bin/star -C " + targetdir + " " + compress + " -x -v -U -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout"); Modified: branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/s… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp (original) +++ branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp Thu Jan 29 19:36:29 2009 @@ -25,6 +25,8 @@ import "Popup"; import "Label"; +import "Directory"; +import "String"; /** * This function removes HTML tags from input string @@ -32,8 +34,7 @@ * @return string String without tags */ -define string RemoveTags(string input) ``{ - string ret = input; +define string RemoveTags(string & ret) ``{ map<string,string> tagmapping = $[ "BR" : "\n", "/P" : "\n", "P" : "", "B" : "", "/B" : "", "EM" : "", "/EM" : "", "I" : "", "/I" : "", "TT" : "", "/TT" : "", @@ -42,17 +43,22 @@ "H3" : "", "/H3" : "" ]; + string tag = nil; + string taglower = nil; + foreach(string t, string repl, tagmapping, ``{ - string tag = "<" + t + ">"; + tag = "<" + t + ">"; while (issubstring(ret, tag)) { ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); } - while (issubstring(ret, tolower(tag))) + taglower = tolower(tag); + + while (issubstring(ret, taglower)) { - ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); + ret = regexpsub(ret, "(.*)" + taglower + "(.*)", "\\1" + repl + "\\2"); } } ); @@ -120,7 +126,35 @@ if (savefile != "" && savefile != nil) { - SCR::Write(.target.string, savefile, RemoveTags(detail_text)); + // Create or empty the file + SCR::Write(.target.string, savefile, ""); + + // BNC #460674 + // Due to the very ineffective all-in-one-run function, removing HTML + // and writing thw whole file at once takes just too much time + // + // Fixed by going through the summary line by line (by <BR>s) + + string tmpfile = Directory::tmpdir + "/restore_tmpfile"; + + y2milestone ("Using tmpfile: %1", tmpfile); + // Using tmpfile - there are more powerful tools for parsing text + if (SCR::Write (.target.string, tmpfile, detail_text)) { + if ((integer) SCR::Execute ( + .target.bash, + sformat ("perl -pi -e \"s/<BR>/\\n\/g;\" '%1'", String::Quote (tmpfile)) == 0 + ) { + detail_text = (string) SCR::Read (.target.string, tmpfile); + } + } + + foreach (string one_line, splitstring (detail_text, "\n"), { + // <BR> == newline + one_line = one_line + "\n"; + // Appending lines one by one + SCR::Write (.backup.file_append, [savefile, RemoveTags (one_line)]); + }); + y2milestone("Summary saved to file: %1", savefile); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0