Hello community, here is the log from the commit of package yast2-add-on checked in at Tue Sep 30 14:06:34 CEST 2008. -------- --- yast2-add-on/yast2-add-on.changes 2008-09-08 17:34:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-add-on/yast2-add-on.changes 2008-09-30 10:54:54.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 30 10:53:19 CEST 2008 - locilka@suse.cz + +- Support for commandline: "help", "longhelp", and "xmlhelp" + (bnc #430852). +- 2.17.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-add-on-2.17.3.tar.bz2 New: ---- yast2-add-on-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.D16682/_old 2008-09-30 14:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.D16682/_new 2008-09-30 14:06:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on (Version 2.17.3) +# spec file for package yast2-add-on (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-add-on -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.17.3.tar.bz2 +Source0: yast2-add-on-2.17.4.tar.bz2 Prefix: /usr Requires: autoyast2-installation # WorkflowManager module @@ -58,7 +58,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-add-on-2.17.3 +%setup -n yast2-add-on-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,10 @@ /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc %doc %{prefix}/share/doc/packages/yast2-add-on %changelog +* Tue Sep 30 2008 locilka@suse.cz +- Support for commandline: "help", "longhelp", and "xmlhelp" + (bnc #430852). +- 2.17.4 * Mon Sep 08 2008 locilka@suse.cz - merged texts from proofread - 2.17.3 ++++++ yast2-add-on-2.17.3.tar.bz2 -> yast2-add-on-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.3/add-on.pot new/yast2-add-on-2.17.4/add-on.pot --- old/yast2-add-on-2.17.3/add-on.pot 2008-09-08 17:31:30.000000000 +0200 +++ new/yast2-add-on-2.17.4/add-on.pot 2008-09-30 11:01:27.000000000 +0200 @@ -1,76 +1,256 @@ -# translation of add-on.po to +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -# Andrew Spackman <kiwilinux@gmail.com>, 2008. +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: add-on\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-04 10:32+0200\n" -"PO-Revision-Date: 2008-08-24 18:03+1200\n" -"Last-Translator: Andrew Spackman <kiwilinux@gmail.com>\n" -"Language-Team: <en@li.org>\n" +"POT-Creation-Date: 2008-09-30 11:01+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" + +#. table cell +#: src/add-on-workflow.ycp:124 src/add-on-workflow.ycp:462 +msgid "No product found in the repository" +msgstr "" + +#. error report +#: src/add-on-workflow.ycp:244 +msgid "No software repository found on medium." +msgstr "" + +#. busy message +#: src/add-on-workflow.ycp:261 +msgid "Initializing new source..." +msgstr "" + +#. error report +#: src/add-on-workflow.ycp:289 src/add-on-workflow.ycp:392 +msgid "Failed to initialize the software repository." +msgstr "" + +#. placeholder for unknown directory +#. place holder for unknown URL +#. placeholder for unknown path +#. placeholder for unknown URL +#. placeholder for unknown path +#. summary item, %1 is product name, %2 media URL, %3 directory on media +#: src/add-on-workflow.ycp:307 src/add-on-workflow.ycp:312 +#: src/add-on-workflow.ycp:806 src/add-on-workflow.ycp:812 +#: src/add-on_proposal.ycp:32 src/add-on_proposal.ycp:36 +msgid "Unknown" +msgstr "" + +#: src/add-on-workflow.ycp:310 +#, ycp-format +msgid "URL: %1, Directory: %2" +msgstr "" + +#. dialog caption +#: src/add-on-workflow.ycp:316 +msgid "Software Repository Selection" +msgstr "" #. help text #: src/add-on-workflow.ycp:318 msgid "" "<p><big><b>Software Repository Selection</b></big><br>\n" -"Multiple repositories found on the selected medium.\n" -"Select the repository to use.</p>" -msgstr "" -"<p><big><b>Software Repository Selection</b></big><br>\n" "Multiple repositories were found on the selected medium.\n" -"Select the repository to use.</p>" +"Select the repository to use.</p>\n" +msgstr "" -#. help text -#: src/add-on-workflow.ycp:614 +#: src/add-on-workflow.ycp:325 +msgid "Repositories &Found" +msgstr "" + +#. if (Stage::initial()) +#. { +#. if (Popup::ConfirmAbort (`painless)) +#. break; +#. } +#. else +#. { +#. yes-no popup +#: src/add-on-workflow.ycp:345 src/add-on-workflow.ycp:634 +msgid "Really abort add-on product installation?" +msgstr "" + +#. popup message +#: src/add-on-workflow.ycp:361 +msgid "Select a repository." +msgstr "" + +#. error pop-up +#: src/add-on-workflow.ycp:532 src/add-on-workflow.ycp:689 msgid "" -"<p><b><big>Product Selection</big></b><br>\n" -"Multiple products found in the repository. Select the products\n" -"to install.</p>" +"The product on the media is already installed\n" +"or selected for installation." +msgstr "" + +#. message popup +#: src/add-on-workflow.ycp:550 +msgid "Dependencies of the add-on product cannot be fulfilled." +msgstr "" + +#. dialog caption +#: src/add-on-workflow.ycp:607 +msgid "Product Selection" +msgstr "" + +#. multi selection list +#: src/add-on-workflow.ycp:611 +msgid "Available Products" msgstr "" + +#. help text +#: src/add-on-workflow.ycp:615 +msgid "" "<p><b><big>Product Selection</big></b><br/>\n" "Multiple products were found in the repository. Select the products\n" -"to install.</p>" +"to install.</p>\n" +msgstr "" + +#. message popup +#: src/add-on-workflow.ycp:676 +msgid "Dependencies of the selected add-on products cannot be fulfilled." +msgstr "" + +#. main screen heading +#. feedback heading +#. TRANSLATORS: dialog caption +#: src/add-on-workflow.ycp:793 src/add-on-workflow.ycp:1311 +#: src/inst_language_add-on.ycp:114 src/inst_language_add-on.ycp:163 +msgid "Add-On Product Installation" +msgstr "" + +#. Help for add-on products +#: src/add-on-workflow.ycp:796 +msgid "" +"<p><big><b>Add-On Product Installation</b></big></br>\n" +"Here see all add-on products that are selected for installation.\n" +"To add a new product, click <b>Add</b>. To remove an already added one,\n" +"select it and click <b>Delete</b>.</p>" +msgstr "" + +#. table cell, %1 is URL, %2 is directory name +#: src/add-on-workflow.ycp:810 +#, ycp-format +msgid "%1, Directory: %2" +msgstr "" + +#. table header +#: src/add-on-workflow.ycp:825 +msgid "Product" +msgstr "" + +#. table header +#: src/add-on-workflow.ycp:827 +msgid "Media" +msgstr "" + +#. message report +#: src/add-on-workflow.ycp:952 +msgid "Select a product to delete." +msgstr "" + +#. TRANSLATORS: busy message +#: src/add-on-workflow.ycp:962 +msgid "Removing selected add-on..." +msgstr "" + +#. TRANSLATORS: dialog caption +#: src/add-on-workflow.ycp:1033 +msgid "Installed Add-On Products" +msgstr "" + +#. TRANSLATORS: table header item +#: src/add-on-workflow.ycp:1040 +msgid "Add-On Product" +msgstr "" + +#. TRANSLATORS: table header item +#: src/add-on-workflow.ycp:1042 +msgid "URL" +msgstr "" + +#. TRANSLATORS: push button +#: src/add-on-workflow.ycp:1058 +msgid "Run &Package Manager..." +msgstr "" #. TRANSLATORS: dialog help adp/1 -#: src/add-on-workflow.ycp:1060 -msgid "<p>Here you can see all add-on products installed on your system.</p>" -msgstr "<p>Here you can see all of the add-on products which are installed on your system.</p>" +#: src/add-on-workflow.ycp:1062 +msgid "<p>Here you can see all of the add-on products which are installed on your system.</p>" +msgstr "" #. TRANSLATORS: dialog help adp/2 -#: src/add-on-workflow.ycp:1062 -msgid "<p>Use <b>Add</b> button to use a new add-on product or <b>Delete</b> to remove an add-on in use.</p>" -msgstr "<p>Use the <b>Add</b> button to add a new add-on product, or the <b>Delete</b> button to remove an add-on which is in use.</p>" +#: src/add-on-workflow.ycp:1064 +msgid "<p>Use the <b>Add</b> button to add a new add-on product, or the <b>Delete</b> button to remove an add-on which is in use.</p>" +msgstr "" + +#: src/add-on-workflow.ycp:1111 +#, ycp-format +msgid "<b>Vendor:</b> %1<br>" +msgstr "" + +#: src/add-on-workflow.ycp:1112 +msgid "Unknown vendor" +msgstr "" + +#: src/add-on-workflow.ycp:1115 +#, ycp-format +msgid "<b>Version:</b> %1<br>" +msgstr "" + +#: src/add-on-workflow.ycp:1116 +msgid "Unknown version" +msgstr "" + +#: src/add-on-workflow.ycp:1119 +#, ycp-format +msgid "<b>Repository URL:</b> %1<br>" +msgstr "" + +#: src/add-on-workflow.ycp:1120 +msgid "Unknown repository URL" +msgstr "" + +#: src/add-on-workflow.ycp:1123 +#, ycp-format +msgid "<b>Repository Alias:</b> %1<br>" +msgstr "" + +#: src/add-on-workflow.ycp:1163 src/add-on-workflow.ycp:1206 +msgid "Unknown product" +msgstr "" + +#: src/add-on-workflow.ycp:1164 +msgid "Unknown URL" +msgstr "" + +#. TRANSLATORS: busy popup message +#: src/add-on-workflow.ycp:1213 +msgid "Removing product dependencies..." +msgstr "" + +#: src/add-on-workflow.ycp:1314 +msgid "Reading packages available at the installation repositories..." +msgstr "" #. TRANSLATORS: commandline help -#: src/add-on.ycp:33 +#: src/add-on.ycp:37 msgid "" "\n" "Add-On Module Help\n" "------------------\n" "\n" -"To add a new add-on product via command-line, use this syntax:\n" -" /sbin/yast2 add-on URL\n" -"URL is the path to the add-on source.\n" -"\n" -"Examples of URL:\n" -"http://server.name/directory/Lang-AddOn-10.2-i386/\n" -"ftp://server.name/directory/Lang-AddOn-10.2-i386/\n" -"nfs://server.name/directory/SDK1-SLE-i386/\n" -"disk://dev/sda5/directory/Product/CD1/\n" -"cd://\n" -"dvd://\n" -msgstr "" -"\n" -"Add-On Module Help\n" -"------------------\n" -"\n" "To add a new add-on product via the command-line, use this syntax:\n" " /sbin/yast2 add-on URL\n" "URL is the path to the add-on source.\n" @@ -82,8 +262,153 @@ "disk://dev/sda5/directory/Product/CD1/\n" "cd://\n" "dvd://\n" +msgstr "" + +#: src/add-on.ycp:57 +msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option." +msgstr "" + +#. dialog caption +#. this is a heading +#: src/add-on.ycp:85 src/add-on_proposal.ycp:69 +msgid "Add-On Products" +msgstr "" + +#. busy message (dialog) +#. TRANSLATORS: dialog content - a very simple label +#: src/add-on.ycp:87 src/inst_language_add-on.ycp:116 +msgid "Initializing..." +msgstr "" + +#. help +#. TRANSLATORS: help text +#: src/add-on.ycp:89 src/inst_language_add-on.ycp:118 +msgid "<p>Initializing add-on products...</p>" +msgstr "" + +#: src/add-on_auto.ycp:59 +#, ycp-format +msgid "<li>Media: %1, Path: %2, Product: %3</li>\n" +msgstr "" + +#. error report +#: src/add-on_auto.ycp:162 +msgid "Failed to add add-on product." +msgstr "" + +#: src/add-on_auto.ycp:164 +#, ycp-format +msgid "Please make the add-on \"%1\" available via \"%2\"" +msgstr "" + +#. summary string +#: src/add-on_proposal.ycp:41 +msgid "No add-on product selected for installation" +msgstr "" + +#. this is a menu entry +#: src/add-on_proposal.ycp:71 +msgid "Add-On &Products" +msgstr "" + +#. TRANSLATORS: popup message +#: src/inst_language_add-on.ycp:77 +msgid "Installation of the Language Extension has been finished." +msgstr "" + +#. TRANSLATORS:: multi-selection box +#: src/inst_language_add-on.ycp:170 +msgid "&Select Language Extensions to be Installed" +msgstr "" #. TRANSLATORS: help text #: src/inst_language_add-on.ycp:177 -msgid "<p>Select language extensions to be installed and click <b>OK</b>.</p>" -msgstr "<p>Select the language extensions to be installed and then click the <b>OK</b> button.</p>" +msgid "<p>Select the language extensions to be installed and then click the <b>OK</b> button.</p>" +msgstr "" + +#. TRANSLATORS: popup question +#: src/inst_language_add-on.ycp:194 +msgid "Are you sure you want to abort the add-on product installation?" +msgstr "" + +#: src/inst_language_add-on.ycp:203 +msgid "" +"There are no selected languages to be installed.\n" +"Are you sure you want to abort the installation?" +msgstr "" + +#. TRANSLATORS: multiselection box item, %1 stands for 'ar', 'mk', 'zh_TW' +#. it used only as a fallback +#: src/inst_language_add-on.ycp:251 +#, ycp-format +msgid "Language %1" +msgstr "" + +#. TRANSLATORS: pop-up headline +#: src/misc.ycp:65 +msgid "Warning: Not enough memory!" +msgstr "" + +#. TRANSLATORS: pop-up question +#: src/misc.ycp:67 +msgid "" +"Your system does not seem to have enough memory to use add-on products\n" +"during installation. You can enable add-on products later when the\n" +"system is running.\n" +"\n" +"Do you want to skip using add-on products?" +msgstr "" + +#. TRANSLATORS: error message - the module does not provide command line interface +#: src/vendor.ycp:29 +msgid "There is no user interface available for this module." +msgstr "" + +#. VENDOR: main screen heading +#: src/vendor.ycp:92 +msgid "Vendor Driver CD" +msgstr "" + +#. VENDOR: cant mount /dev/cdrom popup +#: src/vendor.ycp:108 +msgid "Please insert the vendor CD-ROM" +msgstr "" + +#. VENDOR: vendor cd contains wrong data +#: src/vendor.ycp:157 src/vendor.ycp:171 src/vendor.ycp:219 +msgid "" +"Could not find driver data on the CD-ROM.\n" +"Aborting now." +msgstr "" + +#. VENDOR: vendor cd doesn't contain data for current system and linux version +#: src/vendor.ycp:194 +msgid "" +"The CD-ROM data does not match the running Linux system.\n" +"Aborting now.\n" +msgstr "" + +#. VENDOR: dialog heading +#: src/vendor.ycp:256 +msgid "Installing driver..." +msgstr "" + +#. VENDOR: popup if installation of driver failed +#: src/vendor.ycp:265 +msgid "" +"The installation failed.\n" +"Contact the address on the CD-ROM.\n" +msgstr "" + +#. VENDOR: message box with number of drivers installed +#: src/vendor.ycp:277 +#, ycp-format +msgid "Installed %1 drivers from CD" +msgstr "" + +#. VENDOR: message box with error text +#: src/vendor.ycp:282 +msgid "" +"No driver data found on the CD-ROM.\n" +"Aborting now." +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.3/src/add-on.ycp new/yast2-add-on-2.17.4/src/add-on.ycp --- old/yast2-add-on-2.17.3/src/add-on.ycp 2008-09-08 17:33:59.000000000 +0200 +++ new/yast2-add-on-2.17.4/src/add-on.ycp 2008-09-30 11:14:15.000000000 +0200 @@ -18,16 +18,19 @@ import "GetInstArgs"; import "Mode"; import "CommandLine"; +import "Directory"; +import "XML"; include "add-on/add-on-workflow.ycp"; list wfm_args = WFM::Args(); y2milestone ("ARGS: %1", wfm_args); -if ( - (size (wfm_args) > 0) - && - (contains (wfm_args, "help") || contains (wfm_args, "longhelp")) -) { + +map <string, any> commands = CommandLine::Parse (wfm_args); +y2debug ("Commands: %1", commands); + +// bnc #430852 +if (commands["command"]:"" == "help" || commands["command"]:"" == "longhelp") { Mode::SetUI ("commandline"); // TRANSLATORS: commandline help CommandLine::Print(_(" @@ -47,6 +50,31 @@ dvd:// ")); return `auto; +} else if (commands["command"]:"" == "xmlhelp") { + Mode::SetUI ("commandline"); + if (! haskey (commands["options"]:$[], "xmlfile")) { + CommandLine::Print(_("Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option.")); + return `auto; + } else { + map doc = $[]; + + doc["listEntries"] = $[ + "commands": "command", + "options": "option", + "examples": "example", + ]; + doc["systemID"] = Directory::schemadir + "/commandline.dtd"; + doc["typeNamespace"] = "http://www.suse.com/1.0/configns"; + doc["rootElement"] = "commandline"; + XML::xmlCreateDoc(`xmlhelp, doc); + + map exportmap = $[ + "module" : "add-on", + ]; + XML::YCPToXMLFile(`xmlhelp, exportmap, commands["options", "xmlfile"]:""); + y2milestone("exported XML map: %1", exportmap); + return `auto; + } } Wizard::CreateDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.3/VERSION new/yast2-add-on-2.17.4/VERSION --- old/yast2-add-on-2.17.3/VERSION 2008-09-08 17:34:55.000000000 +0200 +++ new/yast2-add-on-2.17.4/VERSION 2008-09-30 10:54:59.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org