May 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38203 - in /trunk/ncurses/src/pkg: NCPackageSelectorStart.cc NCPackageSelectorStart.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:53:16 2007 New Revision: 38203 URL: http://svn.opensuse.org/viewcvs/yast?rev=38203&view=rev Log: remove YNCursesUI from params Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/pkg/NCPackageSelectorStart.h Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelectorStart.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelectorStart.cc Wed May 30 14:53:16 2007 @@ -40,16 +40,17 @@ // // DESCRIPTION : // -NCPackageSelectorStart::NCPackageSelectorStart( YNCursesUI *ui, - NCWidget * parent, - const YWidgetOpt & opt, YUIDimension dimension, - string floppyDevice ) +NCPackageSelectorStart::NCPackageSelectorStart( NCWidget * parent, + const YWidgetOpt & opt, + YUIDimension dimension ) : NCSplit( parent, opt, dimension ) , widgetRoot( 0 ) , packager( 0 ) , youMode ( false ) , updateMode ( false ) { + YNCursesUI * ui = YNCursesUI::ui(); + // set the textdomain setTextdomain( "packages" ); @@ -64,14 +65,14 @@ YCPTerm pkgLayout = YCPNull(); if ( youMode ) { - pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/you_layout.ycp" ); + pkgLayout = readLayoutFile( "/usr/share/YaST2/data/you_layout.ycp" ); } else { - pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/pkg_layout.ycp" ); + pkgLayout = readLayoutFile( "/usr/share/YaST2/data/pkg_layout.ycp" ); } - if ( ! pkgLayout.isNull() ) + if ( ! pkgLayout.isNull() && ui ) { YWidgetOpt childrenOpt( opt ); widgetRoot = (YContainerWidget *)ui->createWidgetTree( dynamic_cast<YWidget *>(parent), @@ -80,7 +81,7 @@ // create the PackageSelector (creation with 'new' is required because initialization // in the list of member variables causes problems with untranslated messages) - packager = new NCPackageSelector( ui, opt, floppyDevice ); + packager = new NCPackageSelector( ui, opt ); if ( widgetRoot ) { @@ -226,8 +227,7 @@ // // Read a layout file (containing a YCPTerm) // -YCPTerm NCPackageSelectorStart::readLayoutFile( YNCursesUI *ui, - const char * layoutFilename ) +YCPTerm NCPackageSelectorStart::readLayoutFile( const char * layoutFilename ) { YCPTerm pkgLayout = YCPNull(); Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelectorStart.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelectorStart.h Wed May 30 14:53:16 2007 @@ -67,9 +67,8 @@ * Constructor * creates the widget tree of the package selector */ - NCPackageSelectorStart( YNCursesUI *ui, NCWidget * parent, - const YWidgetOpt & opt, YUIDimension dimension, - string floppyDevice ); + NCPackageSelectorStart( NCWidget * parent, + const YWidgetOpt & opt, YUIDimension dimension ); /** * Destructor @@ -105,7 +104,7 @@ * @param layoutFilename The filename * @return YCPTerm */ - YCPTerm readLayoutFile( YNCursesUI *ui, const char * layoutFilename ); + YCPTerm readLayoutFile( const char * layoutFilename ); }; -- 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] r38202 - in /trunk/packager: package/yast2-packager.changes src/modules/SlideShow.ycp
by lslezak＠svn.opensuse.org 30 May '07

30 May '07

Author: lslezak Date: Wed May 30 14:38:23 2007 New Revision: 38202 URL: http://svn.opensuse.org/viewcvs/yast?rev=38202&view=rev Log: - do not show an installation source in the package installation dialog (slideshow) when there is no package to install (#277148) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed May 30 14:38:23 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 14:16:09 CEST 2007 - lslezak(a)suse.cz + +- do not show an installation source in the package installation + dialog (slideshow) when there is no package to install (#277148) + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/packager/src/modules/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShow.y… ============================================================================== --- trunk/packager/src/modules/SlideShow.ycp (original) +++ trunk/packager/src/modules/SlideShow.ycp Wed May 30 14:38:23 2007 @@ -993,8 +993,7 @@ foreach ( list<integer> inst_src, remaining_sizes_per_cd_per_src, ``{ y2milestone( "src #%1: %2", src_no, inst_src ); - if ( ListSum( inst_src ) > 0 // Ignore sources from where there is nothing is to install - || src_no+1 == current_src_no ) // or if this happens to be the current source + if (ListSum(inst_src) > 0) // Ignore sources from where there is nothing is to install { if ( size( total_sizes_per_cd_per_src ) > 1 ) // Multiple sources? { -- 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] r38201 - in /trunk/yast2: package/yast2.changes scripts/save_y2logs
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:49:50 2007 New Revision: 38201 URL: http://svn.opensuse.org/viewcvs/yast?rev=38201&view=rev Log: Fixed bug #278790: save_y2logs complains about missing RPM DB Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/save_y2logs 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 Wed May 30 13:49:50 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 13:48:27 CEST 2007 - sh(a)suse.de + +- Fixed bug #278790: save_y2logs complains about missing RPM DB + +------------------------------------------------------------------- Tue May 29 15:53:15 CEST 2007 - lslezak(a)suse.cz - updated metadata in the sysconfig file (#278612) Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=38… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Wed May 30 13:49:50 2007 @@ -51,9 +51,8 @@ fi RPM_LIST="rpm-qa" -# #270321, there is no rpmdb in inst-sys if [ -f /var/lib/rpm/Packages ]; then - rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' | sort >/var/log/$RPM_LIST + rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST fi if [ -f /var/log/$RPM_LIST ]; 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] r38200 - /tags/branch-SLE-10-SP1-2_13_3/product-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:48:51 2007 New Revision: 38200 URL: http://svn.opensuse.org/viewcvs/yast?rev=38200&view=rev Log: Created tag branch-SLE-10-SP1-2_13_3 for product-creator Added: tags/branch-SLE-10-SP1-2_13_3/product-creator/ - copied from r38199, branches/SuSE-SLE-10-SP1-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] r38199 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:48:43 2007 New Revision: 38199 URL: http://svn.opensuse.org/viewcvs/yast?rev=38199&view=rev Log: - select the boot image automaticaly, according to the base product (#270881) - 2.13.3 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed May 30 13:48:43 2007 @@ -1 +1 @@ -2.13.2 +2.13.3 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed May 30 13:48:43 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 13:28:51 CEST 2007 - jsuchome(a)suse.cz + +- select the boot image automaticaly, according to the base product + (#270881) +- 2.13.3 + +------------------------------------------------------------------- Tue May 29 14:18:19 CEST 2007 - lslezak(a)suse.cz - 2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Wed May 30 13:48:43 2007 @@ -157,7 +157,6 @@ string sw_selection = KiwiConfig["sw_selection"]:"image"; list items = [ `item (`id ("image"), _("Image"), sw_selection == "image"), -// `item (`id ("boot"), _("Boot"), sw_selection == "boot"), ]; if (kiwi_task == "xen") items = add (items, `item (`id ("xen"), _("XEN specific" ), sw_selection == "xen")); @@ -500,8 +499,6 @@ return dir; } - - /** * handler for 'root' directory browse */ @@ -667,7 +664,19 @@ if (Kiwi::PrepareAndCreate ()) { string dir = Kiwi::MoveOutput (KiwiConfig["iso-directory"]:""); - Popup::Message (sformat (success[kiwi_task]:"", dir)); + if (kiwi_task == "usb" && false) + { + // additional question (yes/no) + if (Popup::YesNo (sformat (success[kiwi_task]:"", dir) + _(" +Save the image to the stick now?"))) + { + NotImplementedHandler ("", $[ "ID" : ""]); + } + } + else + { + Popup::Message (sformat (success[kiwi_task]:"", dir)); + } ret = true; } } @@ -720,7 +729,6 @@ if (FileUtils::Exists (kiwi_configuration + "/root")) { -// KiwiConfig["root_dir"] = kiwi_configuration + "/root"; // read all entries from root_dir and save to list map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/root/* 2>/dev/null", kiwi_configuration)); @@ -728,15 +736,10 @@ } if (FileUtils::Exists (kiwi_configuration + "/config")) { -// KiwiConfig["config_dir"] = kiwi_configuration + "/config"; map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/config/* 2>/dev/null", kiwi_configuration)); KiwiConfig["config_dir"] = filter (string f, splitstring(out["stdout"]:"", "\n"),``(f!="")); } - /* - if (FileUtils::Exists (kiwi_configuration + "/images.sh")) - KiwiConfig["images_path"] = kiwi_configuration + "/images.sh"; - */ foreach (string file, [ "images.sh", "config.sh" ], { string file_path = kiwi_configuration + "/" + file; @@ -753,63 +756,43 @@ "openSUSE 10.2" : "suse-10.2", "openSUSE 10.3" : "suse-10.3", "SUSE Linux 10.1" : "suse-10.1", - "SUSE Linux Enterprise Server 10" : "sles10" + "SUSE Linux Enterprise Server 10" : "suse-SLES10", + "SUSE Linux Enterprise Desktop 10" : "suse-SLED10" ]; - string type = KiwiConfig["type",kiwi_task,"boot"]:""; - list l = splitstring (type, ","); - if (issubstring (type, "isoboot/") && kiwi_task == "iso") - { - KiwiConfig["isoboot"] = substring (l[0]:"", search (l[0]:"","isoboot/") + 8); - } - else if (issubstring (type, "xenboot/")) - { - KiwiConfig["xenboot"] = substring (l[0]:"", search (l[0]:"","xenboot/") + 8); - } - else if (issubstring (type, "usbboot/")) - { - KiwiConfig["usbboot"] = substring (l[0]:"", search (l[0]:"","usbboot/") + 8); - } - else if (issubstring (type, "vmxboot/")) - { - KiwiConfig["vmxboot"] = substring (l[0]:"", search (l[0]:"","vmxboot/") + 8); - } + map distproduct2boot = $[ + "openSUSE-10.2-CD-download" : "suse-10.2", + "openSUSE-10.2-dvd5-download" : "suse-10.2", + "openSUSE-10.3-dvd5-download" : "suse-10.3", + "openSUSE-10.3-CD-download" : "suse-10.3", + "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", + "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", + "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", + "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", + "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1" + ]; + string boot_image = label2boot[content["LABEL"]:""]:""; + if (boot_image == "") + boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; // guess some default boot image value - if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && content["LABEL"]:"" != "") + if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") { -// FIXME label2boot mapping is not used because we are reading default configuration -// but could we ALWAYS replace the default string??? - KiwiConfig["isoboot"] = label2boot[content["LABEL"]:""]:""; + KiwiConfig["isoboot"] = boot_image; } else if (kiwi_task == "usb") { - if (!haskey (KiwiConfig, "usbboot") && content["LABEL"]:"" != "") - KiwiConfig["usbboot"] = label2boot[content["LABEL"]:""]:""; - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + if (!haskey (KiwiConfig, "usbboot") && boot_image != "") + KiwiConfig["usbboot"] = boot_image; } else if (kiwi_task == "vmx") { - if (!haskey (KiwiConfig, "vmxboot") && content["LABEL"]:"" != "") - KiwiConfig["vmxboot"] = label2boot[content["LABEL"]:""]:""; - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + if (!haskey (KiwiConfig, "vmxboot") && boot_image != "") + KiwiConfig["vmxboot"] = boot_image; } else if (kiwi_task == "xen") { - /* FIXME still no other image/xenboot image than suse-10.2... if (!haskey (KiwiConfig, "xenboot")) - KiwiConfig["xenboot"] = label2boot[content["LABEL"]:""]:""; - */ - // adapt the default buildhost-suse-10.1 for xen usage - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + KiwiConfig["xenboot"] = boot_image; } string name = KiwiConfig["name"]:""; if (!haskey (KiwiConfig, "specification")) @@ -833,6 +816,7 @@ "contents" : `HBox (`HSpacing(1), `VBox ( `VSpacing (0.2), + /* `HBox ( `HWeight (1, `HBox ( boot_image_widget () @@ -840,6 +824,7 @@ )), `HWeight (1, `VBox (`Label (""), `Left ("compressed"))) ), + */ `VSpacing (0.2), `HBox ( `HWeight (1, "version"), @@ -848,46 +833,18 @@ "sw_selection", `HBox ( `HWeight (1, `VBox ( -// `Left (`Label (_("Software for image"))), "rt_sw", `Right ("configure_sw") `Left (`Label (_("Installed software"))), "rt_sw", `Right ("configure_sw") )), `HWeight (1, "ignore") - /* - `VBox ( - `Left (`Label (_("Packages to ignore"))), - "rt_sw_ignore", - `Right ("configure_sw_ignore") - ) - */ - /* - `VBox ( - `Left (`Label (_("Software for build"))), - "rt_sw_boot", - `Right ("configure_sw_boot") - ) - */ ), - /* - `HBox ( - "output_dir", - `VBox (`Label (""), "browse_output_dir") - ), - */ `VSpacing (0.2) ), `HSpacing(1)), "widget_names" : [ -// "isoboot", - boot_image_widget (), -// "configure_boot", - "compressed", "version", "size", "sizeunit", "sw_selection", "rt_sw", "configure_sw", "ignore", -// "rt_sw_ignore", "configure_sw_ignore", -// "rt_sw_boot", "configure_sw_boot", -// "output_dir", "browse_output_dir", ], ], "description" : $[ @@ -930,27 +887,12 @@ `VBox ( "general_scripts", `VSpacing (0.2), - /* - `HBox ( - "autoyast_path", - `VBox (`Label (""), "browse_autoyast") - ), - */ - /* - `HBox ( - "images_path", - `VBox (`Label (""), "browse_images_path") - ), - */ `HBox ("config.sh", `Bottom ("import_config.sh")), `HBox ("images.sh", `Bottom ("import_images.sh")), `VSpacing (0.2) ), `HSpacing (1)), "widget_names" : [ "general_scripts", -// "root_dir", "browse_root_dir", "config_dir", "browse_config_dir", -// "autoyast_path", "browse_autoyast", -// "images_path", "browse_images_path", "config.sh", "import_config.sh", "images.sh", "import_images.sh", ], @@ -962,12 +904,6 @@ `VBox ( "general_directories", `VSpacing (0.2), - /* - `HBox ( - "root_dir", - `VBox (`Label (""), "browse_root_dir") - ), - */ "root_dir_table", `VSpacing (0.2), `HBox ("root_dir_add", `Left ("root_dir_delete")), @@ -976,26 +912,12 @@ `VSpacing (0.2), `HBox ("config_dir_add", `Left ("config_dir_delete")), `VSpacing (0.2), - /* - `HBox ( - "config_dir", - `VBox (`Label (""), "browse_config_dir") - ), - */ - /* - `HBox ( - "autoyast_path", - `VBox (`Label (""), "browse_autoyast") - ), - */ `VSpacing (0.2) ), `HSpacing (1)), "widget_names" : [ "general_directories", -// "root_dir", "browse_root_dir", "root_dir_table", "root_dir_add", "root_dir_delete", "config_dir_table", "config_dir_add", "config_dir_delete", -// "config_dir", "browse_config_dir", ], ], ]; @@ -1247,7 +1169,6 @@ "no_help" : true, "handle" : HandleDeleteFromConfigDir, ], - "config.sh" : $[ "widget" : `multi_line_edit, // textentry label @@ -1293,24 +1214,6 @@ "help" : "", "handle" : HandleBrowseAutoYaSTFile ], - /* - "images_path" : $[ - "widget" : `textentry, - // textentry label - "label" : _("Pat&h to cleanup script"), - "help" : _("<p>Choose the path to optional <b>cleanup script</b> (<tt>images.sh</tt>). This script is called at the beginning of the image creation process.</p>"), - "init" : InitDescription, - "store" : StoreDescription, - "handle" : HandleDescription, - ], - "browse_images_path": $[ - "widget" : `push_button, - // push button label - "label" : _("Brows&e..."), - "help" : "", - "handle" : HandleBrowseImagesFile - ], - */ "images.sh" : $[ "widget" : `multi_line_edit, // textentry label @@ -1436,7 +1339,7 @@ // dialog caption "usb" : _("USB stick Image Configuration"), // button label - "vmx" : _("Virtual Disk Image Image"), + "vmx" : _("Virtual Disk Image"), ]; map next_button = $[ // button label -- 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] r38198 - /tags/stable-2_15_10/add-on-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:47:24 2007 New Revision: 38198 URL: http://svn.opensuse.org/viewcvs/yast?rev=38198&view=rev Log: Created tag stable-2_15_10 for add-on-creator Added: tags/stable-2_15_10/add-on-creator/ - copied from r38197, trunk/add-on-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] r38197 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:47:07 2007 New Revision: 38197 URL: http://svn.opensuse.org/viewcvs/yast?rev=38197&view=rev Log: - added support for source rpm's (#279004) - 2.15.10 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38197… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Wed May 30 13:47:07 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Wed May 30 13:47:07 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 10:09:52 CEST 2007 - jsuchome(a)suse.cz + +- added support for source rpm's (#279004) +- 2.15.10 + +------------------------------------------------------------------- Tue May 22 10:42:36 CEST 2007 - jsuchome(a)suse.cz - enable rpm directory with .rpm extension (#276861) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Wed May 30 13:47:07 2007 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map<string,string> package2filename = $[]; +// mapping of source package name to full file name +global map<string,string> srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { -- 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] r38196 - /trunk/yast2/library/gpg/testsuite/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:42:58 2007 New Revision: 38196 URL: http://svn.opensuse.org/viewcvs/yast?rev=38196&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/gpg/testsuite/ (props changed) -- 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] r38195 - /trunk/yast2/library/control/testsuite/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:41:54 2007 New Revision: 38195 URL: http://svn.opensuse.org/viewcvs/yast?rev=38195&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/control/testsuite/ (props changed) -- 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] r38194 - /trunk/yast2/library/gpg/src/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:39:14 2007 New Revision: 38194 URL: http://svn.opensuse.org/viewcvs/yast?rev=38194&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/gpg/src/ (props changed) -- 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] r38193 - /trunk/yast2/library/gpg/doc/autodocs/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:38:24 2007 New Revision: 38193 URL: http://svn.opensuse.org/viewcvs/yast?rev=38193&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/gpg/doc/autodocs/ (props changed) -- 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] r38192 - /tags/branch-SLE-10-SP1-2_13_21/add-on-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:30:25 2007 New Revision: 38192 URL: http://svn.opensuse.org/viewcvs/yast?rev=38192&view=rev Log: Created tag branch-SLE-10-SP1-2_13_21 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_21/add-on-creator/ - copied from r38191, branches/SuSE-SLE-10-SP1-Branch/add-on-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] r38191 - in /branches/SuSE-SLE-10-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:30:12 2007 New Revision: 38191 URL: http://svn.opensuse.org/viewcvs/yast?rev=38191&view=rev Log: - added support for source rpm's (#279004) - 2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Wed May 30 13:30:12 2007 @@ -1 +1 @@ -2.13.20 +2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Wed May 30 13:30:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 10:06:57 CEST 2007 - jsuchome(a)suse.cz + +- added support for source rpm's (#279004) +- 2.13.21 + +------------------------------------------------------------------- Tue May 22 10:40:53 CEST 2007 - jsuchome(a)suse.cz - enable rpm directory with .rpm extension (#276861) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Wed May 30 13:30:12 2007 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map<string,string> package2filename = $[]; +// mapping of source package name to full file name +global map<string,string> srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { -- 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] r38190 - /trunk/autoinstallation/src/clients/autoyast.ycp
by ug＠svn.opensuse.org 30 May '07

30 May '07

Author: ug Date: Wed May 30 11:46:12 2007 New Revision: 38190 URL: http://svn.opensuse.org/viewcvs/yast?rev=38190&view=rev Log: commandline helptext fixed Modified: trunk/autoinstallation/src/clients/autoyast.ycp Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Wed May 30 11:46:12 2007 @@ -52,12 +52,12 @@ "id" : "autoyast2", "help" : _("autoyast"), "actions" : $[ - "file" : $[ "handler":openFile, "help":"sure" ] + "file" : $[ "handler":openFile, "help":"file operations" ] ], "options" : $[ "filename": $[ "type":"string", - "help":"no help" + "help":"filename=XML_PROFILE" ] ], "mappings" : $[ -- 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] r38189 - /tags/stable-2_15_37/network/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:35:22 2007 New Revision: 38189 URL: http://svn.opensuse.org/viewcvs/yast?rev=38189&view=rev Log: Created tag stable-2_15_37 for network Added: tags/stable-2_15_37/network/ - copied from r38188, trunk/network/ -- 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] r38188 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:35:00 2007 New Revision: 38188 URL: http://svn.opensuse.org/viewcvs/yast?rev=38188&view=rev Log: Created tag stable-2_15_27 for installation Added: tags/stable-2_15_27/installation/ - copied from r38187, trunk/installation/ -- 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] r38187 - in /trunk/network: package/yast2-network.changes src/dsl/dialogs.ycp yast2-network.spec.in
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:34:28 2007 New Revision: 38187 URL: http://svn.opensuse.org/viewcvs/yast?rev=38187&view=rev Log: fixed spec requirements Modified: trunk/network/package/yast2-network.changes trunk/network/src/dsl/dialogs.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed May 30 11:34:28 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 11:34:16 CEST 2007 - mzugec(a)suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- Tue May 29 12:56:38 CEST 2007 - mzugec(a)suse.cz - add Confirm::MustBeRoot to all network modules (#276478) Modified: trunk/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/dialogs.ycp?rev=… ============================================================================== --- trunk/network/src/dsl/dialogs.ycp (original) +++ trunk/network/src/dsl/dialogs.ycp Wed May 30 11:34:28 2007 @@ -25,6 +25,7 @@ include "network/runtime.ycp"; include "network/routines.ycp"; include "network/widgets.ycp"; +include "network/installation/dialogs.ycp"; /** * DSL device dialog @@ -119,6 +120,7 @@ ifaces = add(ifaces, interface); y2debug("ifaces=%1", ifaces); + y2internal("ifaces=%1", ifaces); ifaces = maplist(string e, (list<string>) ifaces, { return `item(`id(sformat("%1", e)), sformat("%1", e), e == interface); }); @@ -146,6 +148,11 @@ ["USERCONTROL", "STARTMODE",], widget_descr); +NetworkDevices::Read(); + map <string, string> device_descr = GetDeviceDescription(Internet::device); +y2internal("device_descr %1", device_descr); +string connection_text = _("%1 - %2 (%3)"); + /* DSL dialog contents */ term contents = `HBox( `HSpacing(6), @@ -162,15 +169,20 @@ `VSpacing(0.2), `HBox( /* ComboBox label */ - `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), +// `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), + /* RadioButton label */ + `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), + // push button label + `Right(`PushButton(`id(`net_expert), _("&Change Device"))) /* TextEntry label */ // `TextEntry(`id(`interface), _("&Ethernet Card"), interface), - `HSpacing(1), +// `HSpacing(1), +/* `VBox( `Label(""), - /* PushButton label */ `PushButton(`id(`lan), _("&Configure Network Cards")) ) +*/ ), `VSpacing(0.2), /* TextEntry label */ Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Wed May 30 11:34:28 2007 @@ -5,7 +5,8 @@ BuildRequires: pkgconfig perl-XML-Writer rpm BuildRequires: update-desktop-files BuildRequires: yast2-devtools yast2-testsuite yast2 -BuildRequires: yast2-country yast2-installation +BuildRequires: yast2-country +BuildRequires: yast2-installation >= 2.15.27 # String::Random # Linuxrc::display_ip -- 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] r38186 - in /trunk/installation: package/yast2-installation.changes yast2-installation.spec.in
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:34:15 2007 New Revision: 38186 URL: http://svn.opensuse.org/viewcvs/yast?rev=38186&view=rev Log: fixed spec requirements Modified: trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed May 30 11:34:15 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 11:33:52 CEST 2007 - mzugec(a)suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- Mon May 28 16:02:38 CEST 2007 - mzugec(a)suse.cz - removed netsetup item from control files Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Wed May 30 11:34:15 2007 @@ -13,7 +13,7 @@ Requires: yast2-bootloader # Language::selection_skipped, bugzilla #223258 Requires: yast2-country >= 2.15.0 -Requires: yast2-network +Requires: yast2-network >= 2.15.37 # PackagesUI::ConfirmLicenses, bugzilla #256627 Requires: yast2-packager >= 2.15.24 -- 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] r38185 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:31:27 2007 New Revision: 38185 URL: http://svn.opensuse.org/viewcvs/yast?rev=38185&view=rev Log: fixed specfile requirements Removed: tags/stable-2_15_27/installation/ -- 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] r38184 - /tags/stable-2_15_37/network/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:30:26 2007 New Revision: 38184 URL: http://svn.opensuse.org/viewcvs/yast?rev=38184&view=rev Log: fixed specfile requirements Removed: tags/stable-2_15_37/network/ -- 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] r38183 - in /trunk/ftp-server: config/ftp-server.rnc src/FtpServer.ycp src/dialogs.ycp src/uiforms.ycp src/wid_functions.ycp src/write_load.ycp
by juhliarik＠svn.opensuse.org 29 May '07

29 May '07

Author: juhliarik Date: Tue May 29 17:05:37 2007 New Revision: 38183 URL: http://svn.opensuse.org/viewcvs/yast?rev=38183&view=rev Log: added new option for uploading (vsftpd) Modified: trunk/ftp-server/config/ftp-server.rnc trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/dialogs.ycp trunk/ftp-server/src/uiforms.ycp trunk/ftp-server/src/wid_functions.ycp trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/config/ftp-server.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/config/ftp-server.rnc… ============================================================================== --- trunk/ftp-server/config/ftp-server.rnc (original) +++ trunk/ftp-server/config/ftp-server.rnc Tue May 29 17:05:37 2007 @@ -35,5 +35,7 @@ element CertFile { text }? & element VirtualUser { text }? & element FTPUser { text }? & - element GuestUser { text }? + element GuestUser { text }? & + element EnableUpload { text }? + } \ No newline at end of file Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev… ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Tue May 29 17:05:37 2007 @@ -146,7 +146,7 @@ "UmaskAnon", "UmaskLocal", "PasMinPort", "PasMaxPort", "MaxIdleTime", "MaxClientsPerIP", "MaxClientsNumber", "LocalMaxRate", "AnonMaxRate", "AnonAuthen", "AnonReadOnly", "AnonCreatDirs", "Banner", "SSLEnable", "TLS", "AntiWarez", "SSL", "StartXinetd", -"PassiveMode", "CertFile", "SSLv2", "SSLv3", "VirtualUser", "FTPUser", "GuestUser"]; +"PassiveMode", "CertFile", "SSLv2", "SSLv3", "VirtualUser", "FTPUser", "GuestUser", "EnableUpload"]; /** * map of deafult values for options in UI @@ -186,6 +186,7 @@ "VirtualUser" : "NO", "FTPUser" : "ftp", "GuestUser" : "", + "EnableUpload" : "NO", ]; Modified: trunk/ftp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/dialogs.ycp?rev=3… ============================================================================== --- trunk/ftp-server/src/dialogs.ycp (original) +++ trunk/ftp-server/src/dialogs.ycp Tue May 29 17:05:37 2007 @@ -223,11 +223,13 @@ result["custom_widget"] = `VBox(); result["init"] = InitAnonSettings; result["store"] = StoreAnonSettings; + result["handle"] = HandleAnonSettings; result["help"] = DialogHelpText("anon_settings"); return result; } + /** * Init function where are added UI hadle functions * Expert Settings widget (vsftpd) @@ -431,6 +433,28 @@ /** * Init function where are added UI hadle functions + * Anonymous Settings widget + * define for tabs_vsftpd/tabs_pureftpd necessary later in screens (CWNTree) + * + * @return map<string,any> map for Anonymous Settings widget + */ + +map<string,any> vsftpd_anon_settings () { + map<string,any> result = $[]; + + result["contents"] = `VBox ( + VsftpdAnonSettings() + ); + // TRANSLATORS: part of dialog caption + result["caption"] = _("FTP Anonymous Settings"); + // TRANSLATORS: tree menu item + result["tree_item_label"] = _("Authentication"); + result["widget_names"] = [ "DisBackButton", "AnonSettings"]; + + return result; +} +/** + * Init function where are added UI hadle functions * Expert Settings widget (vsftpd) * define for tabs_vsftpd necessary later in screens (CWNTree) * @@ -513,7 +537,7 @@ "VSFTPDAddSettings": VSFTPDSettings(), - "PUREFTPDAddSettings": PUREFTPDAddSettings (), + //"PUREFTPDAddSettings": PUREFTPDAddSettings (), "RBVsPureFTPd" : RBVsftpdPureftpd (), @@ -537,7 +561,7 @@ "perfor_settings" :perfor_settings (), - "anon_settings" : anon_settings (), + "anon_settings" : vsftpd_anon_settings (), "addit_settings" : addit_settings (), Modified: trunk/ftp-server/src/uiforms.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/uiforms.ycp?rev=3… ============================================================================== --- trunk/ftp-server/src/uiforms.ycp (original) +++ trunk/ftp-server/src/uiforms.ycp Tue May 29 17:05:37 2007 @@ -94,6 +94,49 @@ } + + + + + + +term VsftpdAnonSettings() { + term dialog = `VBox ( + `Frame ( _("Enable/Disable Anonymous and Local Users"), + `RadioButtonGroup(`id("AnonAuthen"), + `HBox(`HSpacing(1),`VBox( + `Left(`RadioButton(`id(0), "Anonymo&us Only")), + `Left(`RadioButton(`id(1), "Aut&henticated Users Only", true)), + `Left(`RadioButton(`id(2), "&Both")) + )) + ) //end of `HBox(`HSpacing(1),`RadioButtonGroup(`id("AnonAuthen") + ), //end of `Frame ( _("Enable/Disable Anonymous and Local Users") + `VSpacing(1), + `Frame ( _("Uploading"), + `HBox(`HSpacing(1),`VBox ( + `Left(`CheckBox (`id("EnableUpload"), `opt(`notify), _("&Enable Upload"))), + `HBox(`HSpacing(2),`VBox( + `Left(`CheckBox (`id("AnonReadOnly"), _("Anon&ymous Can Upload"))), + `Left(`CheckBox (`id("AnonCreatDirs"), _("Anonymou&s Can Create Directories"))) + )) + )) + ), //end of `Frame ( _("Anonymous Settings") + `VStretch() + ); + return dialog; +} + + + + + + + + + + + + term FTPAnonSettings() { term dialog = `VBox ( `Frame ( _("Enable/Disable Anonymous and Local Users"), @@ -118,6 +161,11 @@ } + + + + + term VSFTPDAddSettings() { term dialog = `VBox ( `CheckBoxFrame ( `id("PassiveMode"), _("Pass&ive Mode"), true, Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Tue May 29 17:05:37 2007 @@ -307,7 +307,7 @@ } /** - * Init function for performance settings + * Init function for anon settings * change ValidChars from textentry */ void InitAnonSettings(string key) { @@ -318,13 +318,19 @@ (FtpServer::ValueUIEdit("AnonReadOnly") == "NO")); UI::ChangeWidget(`id( "AnonCreatDirs" ), `Value, (FtpServer::ValueUIEdit("AnonCreatDirs") == "YES")); - - + if (FtpServer::vsftpd_edit) { + UI::ChangeWidget(`id( "EnableUpload" ), `Value, + (FtpServer::ValueUIEdit("EnableUpload") == "YES")); + if (!((boolean) UI::QueryWidget(`id("EnableUpload"), `Value))) { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, false); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); + } + } } /** - * Store function for performance settings + * Store function for anon settings * save values to temporary structure */ void StoreAnonSettings (string key, map event) { @@ -334,11 +340,35 @@ }); FtpServer::WriteToEditMap("AnonReadOnly", (((boolean) UI::QueryWidget(`id("AnonReadOnly"), `Value) == true) ? "NO":"YES")); - + if (FtpServer::vsftpd_edit) + FtpServer::WriteToEditMap("EnableUpload", (((boolean) UI::QueryWidget(`id("EnableUpload"), `Value) == true) ? "YES":"NO")); +} + +/** + * Handle function for anon settings + * save values to temporary structure + */ + +symbol HandleAnonSettings(string key, map event) { + if (FtpServer::vsftpd_edit) { + any button = event["ID"]:nil; + if (button == "EnableUpload") { + boolean check_upload = (boolean) UI::QueryWidget(`id("EnableUpload"), `Value); + if (check_upload) { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, true); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, true); + } else { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, false); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); + } + } // end of if (button == "EnableUpload") { + } // end of if (FtpServer::vsftpd_edit) { } + + /** * Init function for pure-ftp-server add settings * change values a display correct widget Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?re… ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Tue May 29 17:05:37 2007 @@ -703,10 +703,13 @@ if (FtpServer::vsftpd_edit) { if (write) { yes_no = FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil; - if (yes_no == "YES") + if (yes_no == "YES") { FtpServer::VS_SETTINGS["anon_upload_enable"] = "NO"; - else + FtpServer::VS_SETTINGS["write_enable"] = "NO"; + } else { FtpServer::VS_SETTINGS["anon_upload_enable"] = "YES"; + FtpServer::VS_SETTINGS["write_enable"] = "YES"; + } } else { if (haskey(FtpServer::VS_SETTINGS, "anon_upload_enable")) { yes_no = toupper(FtpServer::VS_SETTINGS["anon_upload_enable"]:nil); @@ -728,7 +731,9 @@ case("AnonCreatDirs"): if (vsftpd_edit) { if (write) { - FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = EDIT_SETTINGS["AnonCreatDirs"]:nil; + FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; + if (FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") + FtpServer::VS_SETTINGS["write_enable"] = "YES"; } else { return ((haskey(FtpServer::VS_SETTINGS, "anon_mkdir_write_enable") ? toupper(FtpServer::VS_SETTINGS["anon_mkdir_write_enable"]:nil) : FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); @@ -743,6 +748,25 @@ toupper(FtpServer::PURE_SETTINGS["AnonymousCanCreateDirs"]:nil):FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); } break; + //only vsftpd + case("EnableUpload"): + if (FtpServer::vsftpd_edit) { + if (write) { + if (FtpServer::EDIT_SETTINGS["EnableUpload"]:nil != "") + FtpServer::VS_SETTINGS["write_enable"] = FtpServer::EDIT_SETTINGS["EnableUpload"]:nil; + else + FtpServer::VS_SETTINGS["write_enable"] = nil; + } else { + return ((haskey(FtpServer::VS_SETTINGS, "write_enable") ? + FtpServer::VS_SETTINGS["write_enable"]:nil : FtpServer::DEFAULT_CONFIG["EnableUpload"]:nil)); + } + } else { + if (!write) + return FtpServer::DEFAULT_CONFIG["EnableUpload"]:nil; + else + return ""; + } + break; //only vsftpd case("Banner"): -- 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] r38182 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/autoyast.ycp
by ug＠svn.opensuse.org 29 May '07

29 May '07

Author: ug Date: Tue May 29 16:32:44 2007 New Revision: 38182 URL: http://svn.opensuse.org/viewcvs/yast?rev=38182&view=rev Log: added command line interface for opening files Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/autoyast.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue May 29 16:32:44 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 29 16:32:15 CEST 2007 - ug(a)suse.de + +- added command line interface for opening files + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Tue May 29 16:32:44 2007 @@ -18,6 +18,7 @@ import "Sequencer"; import "Popup"; import "AddOnProduct"; + import "CommandLine"; include "autoinstall/dialogs.ycp"; include "autoinstall/conftree.ycp"; @@ -37,6 +38,63 @@ Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue"); Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue"); + void openFile( map <string, any> options ) { + if( !Profile::ReadXML( options["filename"]:"" ) ) { + Popup::Error(_("Error while parsing the control file. +Check the log files for more details or fix the +control file and try again. +")); + } + } + + + map cmdline = $[ + "id" : "autoyast2", + "help" : _("autoyast"), + "actions" : $[ + "file" : $[ "handler":openFile, "help":"sure" ] + ], + "options" : $[ + "filename": $[ + "type":"string", + "help":"no help" + ] + ], + "mappings" : $[ + "file" : ["filename"] + ] + ]; + if(!CommandLine::Init(cmdline, WFM::Args())) + { + y2error("Commandline init failed"); + return (symbol)AutoSequence (); + } + // command line options + /* Init variables */ + string command = ""; + list flags = []; + map<string,any> options = $[]; + string exit = ""; + list l = []; + + while(!CommandLine::Done()) + { + map m = CommandLine::Command(); + command = m["command"]:"exit"; + options = m["options"]:$[]; + + if( command == "file" ) { + openFile(options); + } else { + /* maybe we got "exit" or "quit" */ + if( !CommandLine::Done() ) { + CommandLine::Print("Unknown command (should not happen)"); + continue; + } + } + } + + symbol ret = (symbol)AutoSequence (); AddOnProduct::CleanModeConfigSources(); return ret; -- 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] r38181 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:30:48 2007 New Revision: 38181 URL: http://svn.opensuse.org/viewcvs/yast?rev=38181&view=rev Log: -- 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] r38180 - /trunk/ncurses/src/NCPopupInfo.h
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:29:01 2007 New Revision: 38180 URL: http://svn.opensuse.org/viewcvs/yast?rev=38180&view=rev Log: textdomain added Modified: trunk/ncurses/src/NCPopupInfo.h Modified: trunk/ncurses/src/NCPopupInfo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.h?rev=38… ============================================================================== --- trunk/ncurses/src/NCPopupInfo.h (original) +++ trunk/ncurses/src/NCPopupInfo.h Tue May 29 16:29:01 2007 @@ -32,6 +32,11 @@ #include "NCPushButton.h" #include "NCi18n.h" + +/* + Textdomain "packages" +*/ + class YCPValue; /////////////////////////////////////////////////////////////////// -- 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] r38179 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:26:56 2007 New Revision: 38179 URL: http://svn.opensuse.org/viewcvs/yast?rev=38179&view=rev Log: again and better Modified: trunk/ncurses/POTFILES Modified: trunk/ncurses/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/POTFILES?rev=38179&r1=38… ============================================================================== --- trunk/ncurses/POTFILES (original) +++ trunk/ncurses/POTFILES Tue May 29 16:26:56 2007 @@ -4,12 +4,12 @@ ./src/NCurses.cc ./src/NCDialog.cc ./src/NCPopupInfo.h -pkg/NCPkgTable.cc -pkg/pkg_layout.ycp -pkg/NCPkgPopupDiskspace.cc -pkg/NCPkgNames.cc -pkg/NCPkgPopupSearch.cc -pkg/NCPkgPopupDeps.cc -pkg/NCPackageSelector.cc -pkg/you_layout.ycp +./src/pkg/NCPkgTable.cc +./src/pkg/pkg_layout.ycp +./src/pkg/NCPkgPopupDiskspace.cc +./src/pkg/NCPkgNames.cc +./src/pkg/NCPkgPopupSearch.cc +./src/pkg/NCPkgPopupDeps.cc +./src/pkg/NCPackageSelector.cc +./src/pkg/you_layout.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0