April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56946 - in /trunk/packager: VERSION package/yast2-packager.changes src/include/repositories_include.ycp
by lslezak＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: lslezak Date: Thu Apr 23 17:20:49 2009 New Revision: 56946 URL: http://svn.opensuse.org/viewcvs/yast?rev=56946&view=rev Log: - added a new progress dialog when registering a new repository, download progresses are embedded into the progress dialog instead of separate popups for each file (bnc#466808) Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=56946&r1=56… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Apr 23 17:20:49 2009 @@ -1 +1 @@ -2.18.5 +2.18.6 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 Thu Apr 23 17:20:49 2009 @@ -1,8 +1,16 @@ ------------------------------------------------------------------- +Thu Apr 23 17:16:36 CEST 2009 - lslezak(a)suse.cz + +- added a new progress dialog when registering a new repository, + download progresses are embedded into the progress dialog instead + of separate popups for each file (bnc#466808) + +------------------------------------------------------------------- Thu Apr 23 15:19:17 CEST 2009 - lslezak(a)suse.cz - display an additional help when adding an ISO repository over FTP or HTTP protocol fails (bnc#341668) +- 2.18.6 ------------------------------------------------------------------- Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Thu Apr 23 17:20:49 2009 @@ -21,6 +21,7 @@ import "Label"; import "SourceDialogs"; import "Report"; + import "Progress"; textdomain "packager"; @@ -36,9 +37,7 @@ boolean download_meta = true; boolean LicenseAccepted (integer id) { - Wizard::CreateDialog (); boolean ret = AddOnProduct::AcceptedLicenseAndInfoFile (id); - UI::CloseDialog (); return ret; } @@ -64,6 +63,18 @@ PackageSystem::CheckAndInstallPackages(["cifs-mount"]); } + Progress::New ( + // TRANSLATORS: dialog caption + _("Adding a New Repository"), + " ", + 3, + [ _("Check Repository Type"), _("Add Repository"), _("Read Repository License") ], + [ _("Checking Repository Type"), _("Adding Repository"), _("Reading Repository License") ], + // TRANSLATORS: dialog help + _("<p>Please wait while the repository manager downloads the repository details...</p>") + ); + + Progress::NextStage(); string service_type = Pkg::ServiceProbe(url); y2milestone("Probed service type: %1", service_type); @@ -242,6 +253,7 @@ repo_prop["base_urls"] = [ url ]; repo_prop["type"] = repo_type; + Progress::NextStage(); integer new_repo_id = Pkg::RepositoryAdd(repo_prop); y2milestone("Added repository: %1: %2", new_repo_id, repo_prop); @@ -291,6 +303,7 @@ } else { + Progress::NextStage(); foreach( integer id, newSources, ``{ if (! LicenseAccepted (id)) { -- 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] r56945 - in /trunk/bootloader: scripts/Makefile.am scripts/examine_mbr.pl src/grub/misc.ycp src/modules/BootCommon.ycp src/routines/lib_iface.ycp src/routines/lilolike.ycp src/routines/misc.ycp
by juhliarik＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: juhliarik Date: Thu Apr 23 16:48:09 2009 New Revision: 56945 URL: http://svn.opensuse.org/viewcvs/yast?rev=56945&view=rev Log: update yast2-bootloader to using new function for detection content of MBR Removed: trunk/bootloader/scripts/examine_mbr.pl Modified: trunk/bootloader/scripts/Makefile.am trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/scripts/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/Makefile.am?r… ============================================================================== --- trunk/bootloader/scripts/Makefile.am (original) +++ trunk/bootloader/scripts/Makefile.am Thu Apr 23 16:48:09 2009 @@ -2,7 +2,7 @@ # Makefile.am for y2m_inst/ycp/bootloader/milo/agents # -ybin_SCRIPTS = ppc_postinstall.sh update_gfxmenu examine_mbr.pl tp_mbr +ybin_SCRIPTS = ppc_postinstall.sh update_gfxmenu tp_mbr EXTRA_DIST = $(ybin_SCRIPTS) Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Thu Apr 23 16:48:09 2009 @@ -492,26 +492,6 @@ * Returns the type of device where to install: one of `boot `root `mbr `extended `mbr_md * Also sets the boot_* keys in the internal global variable globals accordingly. * - * Sets internal global variables: - * - boot_* keys in globals map set flags according to the selected bootloader device (currently one of: "boot", "root", "mbr", "mbr_md", "extended") - * - activate key in globals map to true if the partitions for stage 1 need to be "activated" (aka "set bootable") in the MBR - * - activate_changed leave untouched, except when - * - booting from a primary /boot partition on the first disk (the one with the MBR seen by the BIOS), then set to true - * (FIXME: why only then?) - * - generic_mbr key in globals map leave untouched, except when - * - booting from a primary /boot partition on the first disk, then set to true when - * - the examination of the code in the MBR - * - by examine_mbr.pl shows that it - * - DOES NOT look like a valid "stage 1" at all (not enough entropy to contain valid code) OR - * - DOES NOT look like a "generic MBR" (= DOS MBR) (OK as stage 1 to boot primary part. on 1st disk) OR - * - DOES look like a LILO or GRUB MBR (replace them with generic code - * (if stage 1 is not in MBR, see code in updateMBR()), - * they probably contain an obsolete block list for stage 2) OR - * - DOES look like some "stage 1" code (has enough entropy, but no known signature) OR - * - by KeepMBR() -> ThinkPadMBR() shows that it - * - DOES NOT look like a Thinkpad MBR (begins with specific code sequence from that one) - * otherwise set to false - * * @return string type of location proposed to bootloader */ define symbol grub_ConfigureLocation() { @@ -589,15 +569,6 @@ selected_location = `boot; BootCommon::globals["activate"] = "true"; BootCommon::activate_changed = true; - // examine_mbr.pl returns - // - != 0 (errno, e.g. 2) for a read error: "cannot read 512 - // bytes from <dev>" - // - 254 for an "invalid MBR", i.e. without enough entropy to - // contain boot code - // - 254 for a "Generic MBR" (DOS MBR) - bnc #438752 - // - 254 for a GRUB or lilo "stage 1" - // - 254 for an unknown MBR - // - 0 for Vista MBR // check if there is raid and if it soft-raid select correct device for analyse MBR // bnc #398356 @@ -605,19 +576,16 @@ boot_partition_disk = soft_MDraid_boot_disk(partitions_on_boot_partition_disk); if (boot_partition_disk == "") boot_partition_disk = dp["disk"]:""; - // bnc #483797 cannot read 512 bytes from at /usr/lib/YaST2/bin/examine_mbr.pl + // bnc #483797 cannot read 512 bytes from... + string out = ""; if (boot_partition_disk != "") { - map out = (map)SCR::Execute (.target.bash_output, sformat ( - "/usr/lib/YaST2/bin/examine_mbr.pl %1", boot_partition_disk)); - y2milestone ("MBR examining script returned %1", out); - exit = out["exit"]:0; + out = BootCommon::examineMBR(boot_partition_disk); } else { - exit = 254; y2error("Boot partition disk not found"); } - BootCommon::globals["generic_mbr"] = ((exit == 254) && (! keep_mbr)) ? "true" : "false"; - if (exit == 0) + BootCommon::globals["generic_mbr"] = ((out != "vista") && (! keep_mbr)) ? "true" : "false"; + if (out == "vista") { y2milestone("Vista MBR..."); vista_mbr = true; Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Apr 23 16:48:09 2009 @@ -298,7 +298,7 @@ global define list<string> Summary (); global map<string,any> CreateLinuxSection (string title); global string UpdateSerialConsole (string append, string console); - +global string examineMBR (string device); /* * help message and dscription definitions Modified: trunk/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lib_ifac… ============================================================================== --- trunk/bootloader/src/routines/lib_iface.ycp (original) +++ trunk/bootloader/src/routines/lib_iface.ycp Thu Apr 23 16:48:09 2009 @@ -342,6 +342,21 @@ return ret; } +/** + * Analyse content of MBR + * + * @param string device name ("/dev/sda") + * @return string result of analyse ("GRUB stage1", "uknown",...) + */ + +global string examineMBR (string device) +{ + string ret = System::Bootloader_API::examineMBR (device); + y2milestone("Device: %1 includes in MBR: %2", device, ret); + return ret; + +} + } //end of include /* Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Apr 23 16:48:09 2009 @@ -130,26 +130,6 @@ * Returns the type of device where to install: one of "boot", "root", "mbr", "mbr_md" * Also sets internal global variable selected_location to this. * - * Sets internal global variables: - * - selected_location to the type of bootloader device (currently one of: "boot", "root", "mbr", "mbr_md") - * - loader_device to the actual device name to install the bootloader to (e.g. "/dev/hda1") or to "mbr_md" - * - activate to true if the loader_device needs to be activated in the MBR - * - activate_changed leave untouched, except when - * - booting from a primary /boot partition on the first disk (the one with the MBR seen by the BIOS), then set to true - * (FIXME: why only then?) - * - repl_mbr leave untouched, except when - * - booting from a primary /boot partition on the first disk, then set to true when - * - the examination of the code in the MBR - * - by examine_mbr.pl shows that it - * - DOES NOT look like a valid "stage 1" at all (not enough entropy to contain valid code) OR - * - DOES NOT look like a "generic MBR" (= DOS MBR) (OK as stage 1 to boot primary part. on 1st disk) OR - * - DOES look like a LILO or GRUB MBR (replace them with generic code - * (if stage 1 is not in MBR, see code in updateMBR()), - * they probably contain an obsolete block list for stage 2) OR - * - DOES look like some "stage 1" code (has enough entropy, but no known signature) OR - * - by KeepMBR() -> ThinkPadMBR() shows that it - * - DOES NOT look like a Thinkpad MBR (begins with specific code sequence from that one) - * otherwise set to false * * @return string type of location proposed to bootloader */ @@ -211,29 +191,16 @@ loader_device = BootStorage::BootPartitionDevice; activate = true; activate_changed = true; - // examine_mbr.pl returns - // - != 0 (errno, e.g. 2) for a read error: "cannot read 512 - // bytes from <dev>" - // - 254 for an "invalid MBR", i.e. without enough entropy to - // contain boot code - // - 254 for a "Generic MBR" (DOS MBR) - bnc #438752 - // - 254 for a GRUB or lilo "stage 1" - // - 254 for an unknown MBR - // - 0 for a Vista MBR - - + // check if there is raid and if it soft-raid select correct device for analyse MBR // bnc #398356 if (size (needed_devices) > 1) disk = soft_MDraid_boot_disk(partitions); if (disk == "") disk = dp["disk"]:""; + string out = examineMBR(disk); - map out = (map)SCR::Execute (.target.bash_output, sformat ( - "/usr/lib/YaST2/bin/examine_mbr.pl %1", disk)); - y2milestone ("MBR examining script returned %1", out); - exit = out["exit"]:0; - repl_mbr = (exit == 254) && (! keep_mbr); + repl_mbr = (out != "vista") && (! keep_mbr); } else if (size (needed_devices) > 1) Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Apr 23 16:48:09 2009 @@ -400,16 +400,11 @@ */ global boolean IsPartitionBootable (string device) { //FIXME this is only for grub and should go to BootGRUB - // use examine_mbr.pl to analyze PBR (partition boot record): - // examine_mbr.pl prints "* stage1" when it finds the signature + // use examineMBR to analyze PBR (partition boot record): + // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader - // (The exit code would tell us only whether we should - // (re-)install a bootloader stage1 there in order to make the - // partition bootable, not whether a stage1 already exists.) - map result = (map)SCR::Execute (.target.bash_output, sformat ( - "/usr/lib/YaST2/bin/examine_mbr.pl %1", device)); - y2milestone ("PBR examining script returned %1", result); - return search(result["stdout"]:"", "stage1") != nil ? true : false; + string result = examineMBR(device); + return search(result, "stage1") != nil ? true : false; } -- 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] r56944 - in /trunk/devtools/devtools/bin: Makefile.am oscsubmit
by jsrain＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: jsrain Date: Thu Apr 23 16:40:15 2009 New Revision: 56944 URL: http://svn.opensuse.org/viewcvs/yast?rev=56944&view=rev Log: backup commit of oscsubmit Added: trunk/devtools/devtools/bin/oscsubmit Modified: trunk/devtools/devtools/bin/Makefile.am Modified: trunk/devtools/devtools/bin/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/Makefile.a… ============================================================================== --- trunk/devtools/devtools/bin/Makefile.am (original) +++ trunk/devtools/devtools/bin/Makefile.am Thu Apr 23 16:40:15 2009 @@ -23,6 +23,7 @@ svnall \ svnignore \ tagversion \ + oscsubmit \ version \ y2autoconf \ y2automake \ Added: trunk/devtools/devtools/bin/oscsubmit URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/oscsubmit?… ============================================================================== --- trunk/devtools/devtools/bin/oscsubmit (added) +++ trunk/devtools/devtools/bin/oscsubmit Thu Apr 23 16:40:15 2009 @@ -0,0 +1,68 @@ +#!/bin/bash + +# usage: +# y2submit [<OBS_Project> [<logfile>]] + + +OBS_PROJECT=$1; +OBS_MOVE_PROJECT=$2; +LOGFILE=$3; +PACKAGE=`cat RPMNAME`; +test -z $OBS_PROJECT && OBS_PROJECT=YaST:SVN +test -z $OBS_MOVE_PROJECT && OBS_MOVE_PROJECT=openSUSE:Factory +test -z "$LOGFILE" && LOGFILE=~/.y2submitlog + +rm $LOGFILE +echo "Submitting $PACKAGE to $OBS_PROJECT, forwarding to $OBS_MOVE_PROJECT" | tee -a $LOGFILE + +echo -n "Checking out module from OBS... " | tee -a $LOGFILE +echo "" >>$LOGFILE; +if osc co $OBS_PROJECT $PACKAGE >>$LOGFILE 2>&1; then + echo "OK" | tee -a $LOGFILE +else + echo "Failed" | tee -a $LOGFILE; exit 3 +fi + +echo -n "Preparing new package for submission... " | tee -a $LOGFILE +echo "" >>$LOGFILE; +rm $OBS_PROJECT/$PACKAGE/* +cp package/* $OBS_PROJECT/$PACKAGE +osc addremove $OBS_PROJECT/$PACKAGE >>$LOGFILE +echo "OK" | tee -a $LOGFILE +diff $OBS_PROJECT/$PACKAGE/*changes $OBS_PROJECT/$PACKAGE/.osc/*changes >diff +cat diff | tee -a $LOGFILE +if grep '^>' diff ; then + echo "There are changes in OBS only not reflected in SVN. Merge them first." | tee -a $LOGFILE + exit 4 +fi + +if grep '^<' diff ; then + echo -n ""; +else + echo "There are no new changes in SVN." | tee -a $LOGFILE + exit 4 +fi + +echo -n "Submitting the package... " | tee -a $LOGFILE +echo "" >>$LOGFILE; +find $OBS_PROJECT >>$LOGFILE; +if osc ci -F diff $OBS_PROJECT/$PACKAGE >>$LOGFILE 2>&1 ; then + echo "OK" | tee -a $LOGFILE +else + echo "Failed" | tee -a $LOGFILE; exit 5 +fi + +echo -n "Forwarding package from $OBS_PROJECT to $OBS_MOVE_PROJECT... " | tee -a $LOGFILE +echo "" >>$LOGFILE; +if osc sr create --nodevelproject $OBS_PROJECT $PACKAGE $OBS_MOVE_PROJECT ; then + echo "OK" | tee -a $LOGFILE +else + echo "Failed" | tee -a $LOGFILE; exit 6 +fi + +echo -n "Cleaning up... " | tee -a $LOGFILE +echo "" >>$LOGFILE; +rm diff; +rm -rf $OBS_PROJECT; +echo "OK" | tee -a $LOGFILE +exit 0; -- 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] r56943 - /trunk/storage/package/yast2-storage.changes
by kmachalkova＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: kmachalkova Date: Thu Apr 23 16:34:13 2009 New Revision: 56943 URL: http://svn.opensuse.org/viewcvs/yast?rev=56943&view=rev Log: changes Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Apr 23 16:34:13 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 23 16:32:02 CEST 2009 - kmachalkova(a)suse.cz + +- Added functional equivalents (buttons) to context menus + +------------------------------------------------------------------- Tue Apr 21 14:43:05 CEST 2009 - aschnell(a)suse.de - removed use of ModulesConf module (might break support for -- 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] r56942 - /trunk/storage/storage/src/include/ep-lib.ycp
by kmachalkova＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: kmachalkova Date: Thu Apr 23 16:29:37 2009 New Revision: 56942 URL: http://svn.opensuse.org/viewcvs/yast?rev=56942&view=rev Log: stupid mistake :( Modified: trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Thu Apr 23 16:29:37 2009 @@ -185,8 +185,7 @@ } else { - HandleRemoveLv( tg, id ); - return true; + return HandleRemoveLv( tg, id ); } } else -- 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] r56941 - /tags/stable-2_18_13/printer/
by jsmeix＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: jsmeix Date: Thu Apr 23 16:27:05 2009 New Revision: 56941 URL: http://svn.opensuse.org/viewcvs/yast?rev=56941&view=rev Log: Created tag stable-2_18_13 for printer Added: tags/stable-2_18_13/printer/ - copied from r56940, trunk/printer/ -- 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] r56940 - in /trunk/printer: VERSION package/yast2-printer.changes src/connectionwizard.ycp src/overview.ycp src/policies.ycp
by jsmeix＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: jsmeix Date: Thu Apr 23 16:26:54 2009 New Revision: 56940 URL: http://svn.opensuse.org/viewcvs/yast?rev=56940&view=rev Log: - When printing a testpage in the Overview dialog, explicitely show the pending print jobs so that the user can now better decide whether or not the pending jobs could be deleted. - Fixed serial printer setup in the Connection Wizard (see Novell/Suse Bugzilla bnc#488655) and fixed SCSI printer setup in the Connection Wizard accordingly. - Makeshift fix of the bluetooth setup in the Connection Wizard so that manual bluetooth printer setup is possible now (see Novell/Suse Bugzilla bnc#467220 comment #11). - Removed all stuff regarding "infra" from the Connection Wizard because we do not and did not provide a CUPS backend for infrared access (IrDA) which does not mean that such a setup is impossible because any special case can be set up via "Specify Arbitrary Device URI". - 2.18.13 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/connectionwizard.ycp trunk/printer/src/overview.ycp trunk/printer/src/policies.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=56940&r1=569… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Apr 23 16:26:54 2009 @@ -1 +1 @@ -2.18.12 +2.18.13 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Apr 23 16:26:54 2009 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Thu Apr 23 13:24:07 CEST 2009 - jsmeix(a)suse.de + +- When printing a testpage in the Overview dialog, explicitely + show the pending print jobs so that the user can now better + decide whether or not the pending jobs could be deleted. +- Fixed serial printer setup in the Connection Wizard + (see Novell/Suse Bugzilla bnc#488655) and + fixed SCSI printer setup in the Connection Wizard accordingly. +- Makeshift fix of the bluetooth setup in the Connection Wizard + so that manual bluetooth printer setup is possible now + (see Novell/Suse Bugzilla bnc#467220 comment #11). +- Removed all stuff regarding "infra" from the Connection Wizard + because we do not and did not provide a CUPS backend for + infrared access (IrDA) which does not mean that such a setup + is impossible because any special case can be set up + via "Specify Arbitrary Device URI". +- 2.18.13 + +------------------------------------------------------------------- Thu Apr 16 17:00:12 CEST 2009 - jsmeix(a)suse.de - Undo using "-o document-format=application/vnd.cups-postscript" Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Thu Apr 23 16:26:54 2009 @@ -208,20 +208,274 @@ case(`usb): content = getContentFromBackend("usb"); break; - case(`serial): - content = getContentFromBackend("serial"); + case(`hplip): + content = getContentFromBackend("hp"); break; - case(`infra): - content = getContentFromBackend("infra"); + case(`serial): + content = `VBox + ( `Left + ( `ComboBox + ( `id(`serial_device_node), + // This ComboBox is editable because there could be + // any kind of serial device node name "/dev/whatever": + `opt(`editable), + // Label for an editable ComboBox where + // a serial device node (e.g. /dev/ttyS0 or /dev/ttyS1) + // can be selected or entered: + _("&Serial device"), + [ // Have nothing preselected to be on the safe side because + // the CUPS serial backend may blindly write to the device, + // (see backend/serial.c in the CUPS 1.3.9 sources): + `item( `id(""), "", true ), + `item( `id("/dev/ttyS0"), "/dev/ttyS0" ), + `item( `id("/dev/ttyS1"), "/dev/ttyS1" ), + `item( `id("/dev/ttyS2"), "/dev/ttyS2" ), + `item( `id("/dev/ttyS3"), "/dev/ttyS3" ), + `item( `id("/dev/ttyS4"), "/dev/ttyS4" ), + `item( `id("/dev/ttyS5"), "/dev/ttyS5" ), + `item( `id("/dev/ttyS6"), "/dev/ttyS6" ), + `item( `id("/dev/ttyS7"), "/dev/ttyS7" ) + ] + ) + ), + `Left + ( `ComboBox + ( `id(`serial_baud_rate), + // The backend/serial.c in the CUPS 1.3.9 sources + // supports only the preset values below. + // Nevertheless this ComboBox is editable to be future-proof: + `opt(`editable), + // Label for an editable ComboBox where + // the baud rate for a serial device + // can be selected or entered: + _("&Baud rate"), + // The preset values are from backend/serial.c + // in the CUPS 1.3.9 sources: + [ // Have nothing preselected to be on the safe side because the baud rate + // may have to be exactly what is set in the printer (e.g. via DIP switches): + `item( `id(""), "", true ), + `item( `id("1200"), "1200" ), + `item( `id("2400"), "2400" ), + `item( `id("4800"), "4800" ), + `item( `id("9600"), "9600" ), + `item( `id("19200"), "19200" ), + `item( `id("38400"), "38400" ), + `item( `id("57600"), "57600" ), + `item( `id("115200"), "115200" ), + `item( `id("230400"), "230400" ) + ] + ) + ), + `Left + ( `ComboBox + ( `id(`serial_data_bits), + // The backend/serial.c in the CUPS 1.3.9 sources + // supports only the preset values below (7 and 8). + // Nevertheless this ComboBox is editable to be future-proof + // because according to http://en.wikipedia.org/wiki/Serial_port + // a serial port might also have 5, 6, or 9 data bits. + `opt(`editable), + // Label for an editable ComboBox where + // the number of data bits for a serial device + // can be selected or entered: + _("&Data bits"), + // The preset values are from backend/serial.c + // in the CUPS 1.3.9 sources: + [ `item( `id(""), "", true ), + `item( `id("7"), "7" ), + `item( `id("8"), "8" ) + ] + ) + ), + `Left + ( `ComboBox + ( `id(`serial_parity), + // The backend/serial.c in the CUPS 1.3.9 sources + // supports only the preset values below. + // Nevertheless this ComboBox is editable to be future-proof: + `opt(`editable), + // Label for an editable ComboBox where + // the parity checking for a serial device + // can be selected or entered: + _("&Parity checking"), + // The preset values are from backend/serial.c + // in the CUPS 1.3.9 sources: + [ `item( `id(""), "", true ), + `item( `id("even"), "even" ), + `item( `id("odd"), "odd" ), + `item( `id("none"), "none" ), + `item( `id("space"), "space" ), + `item( `id("mark"), "mark" ) + ] + ) + ), + `Left + ( `ComboBox + ( `id(`serial_flow_control), + // The backend/serial.c in the CUPS 1.3.9 sources + // supports only the preset values below. + // Nevertheless this ComboBox is editable to be future-proof + // because according to http://en.wikipedia.org/wiki/Flow_control + // a serial port might also have another kind of flow control. + `opt(`editable), + // Label for an editable ComboBox where + // the flow control for a serial device + // can be selected or entered: + _("&Flow control"), + // The preset values are from backend/serial.c + // in the CUPS 1.3.9 sources: + [ `item( `id(""), "", true ), + `item( `id("soft"), "soft" ), + `item( `id("hard"), "hard" ), + `item( `id("none"), "none" ), + `item( `id("rtscts"), "rtscts" ), + `item( `id("dtrdsr"), "dtrdsr" ) + ] + ) + ), + `Left + ( `ComboBox + ( `id(`serial_stop_bits), + // The backend/serial.c in the CUPS 1.3.9 sources + // supports only the preset values below. + // Nevertheless this ComboBox is editable to be future-proof: + `opt(`editable), + // Label for an editable ComboBox where + // the number of stop bits for a serial device + // can be selected or entered: + _("S&top bits"), + // The preset values are from backend/serial.c + // in the CUPS 1.3.9 sources: + [ `item( `id(""), "", true ), + `item( `id("1"), "1" ), + `item( `id("2"), "2" ) + ] + ) + ), + model_for_using_driver_content + ); break; case(`bluetooth): - content = getContentFromBackend("bluetooth"); + // Fallback message what the user may run manually when it fails + // to generate a valid list of bluetooth device IDs: + string bluetooth_device_list = _("Run 'hcitool scan' to get a list of bluetooth device IDs."); + Popup::ShowFeedback( // No title for a simple busy message: + "", + // Busy message: + // Body of a Popup::ShowFeedback: + _("Retrieving bluetooth device IDs...") + ); + // The command "hcitool scan" might need very much time or hang up. + // To kill exactly hcitool there is the workaround via the temporary file because + // hcitool scan | grep '...' & sleep 10 ; kill -9 $! + // would kill only grep and + // ( hcitool scan | grep '...' ) & sleep 10 ; kill -9 $! + // would kill only the sub shell. + if( ! Printerlib::ExecuteBashCommand( "hcitool scan >/tmp/hcitool_scan.out & sleep 10 ; kill -9 $! ; grep '..:..:..:..:..:..' /tmp/hcitool_scan.out | tr -s ' ' ; rm -f /tmp/hcitool_scan.out" ) ) + { // Will probably never fail because the final "rm -f ..." should exit successfully in any case: + Popup::ErrorDetails( // Popup::ErrorDetails message: + _("Failed to get a list of bluetooth device IDs."), + "hcitool scan" + "\n" + Printerlib::result["stderr"]:"" + ); + } + else + { if( "" != Printerlib::result["stdout"]:"" ) + { bluetooth_device_list = Printerlib::result["stdout"]:""; + } + } + Popup::ClearFeedback(); + y2milestone( "bluetooth_device_list '%1'", bluetooth_device_list ); + // Have an empty string preselected to be on the safe side because + // the bluetooth backend may blindly write to the device: + list <term> bluetooth_device_id_items = [ `item( `id(""), "", true ) ]; + foreach( string word, + splitstring( bluetooth_device_list, " " ), + { if( regexpmatch( word, "..:..:..:..:..:..") ) + { // A bluetooth device ID has the form 1A:2B:3C:4D:5E:6F + // but the bluetooth backend needs it without the colons ':' + // in its DeviceURI which has the form bluetooth://1A2B3C4D5E6F + string hexnumber = filterchars( word, "0123456789ABCDEFabcdef" ); + if( "" != hexnumber ) + { bluetooth_device_id_items = add( bluetooth_device_id_items, `item( `id( hexnumber ), hexnumber ) ); + } + } + } + ); + content = `VBox + ( `Left + ( `ComboBox + ( `id(`bluetooth_device_id), + `opt(`editable), + // Label for an editable ComboBox where + // a bluetooth device ID + // can be selected or entered: + _("&Bluetooth device ID"), + bluetooth_device_id_items + ) + ), + `Left + ( `Frame + ( // TRANSLATORS: Frame label for a list of bluetooth device IDs: + _("Currently available bluetooth device IDs"), + // The RichText widget is required here to get scroll bars if needed + // (a Label cuts the content because it does not provide scroll bars): + `RichText( "<pre>" + bluetooth_device_list + "</pre>" ) + ) + ), + model_for_using_driver_content + ); break; case(`scsi): - content = getContentFromBackend("scsi"); - break; - case(`hplip): - content = getContentFromBackend("hp"); + // Fallback message what the user may run manually when it fails + // to generate the current list of SCSI generic device nodes: + string scsi_device_list = _("Run 'lsscsi -g' to get a list of SCSI generic devices (/dev/sg...)."); + if( ! Printerlib::ExecuteBashCommand( "lsscsi -g | tr -s ' ' | cut -s -d ' ' -f 3- | grep '/dev/sg'" ) ) + { Popup::ErrorDetails( // Popup::ErrorDetails message: + _("Failed to get a list of SCSI generic devices."), + "lsscsi -g" + "\n" + Printerlib::result["stderr"]:"" + ); + } + else + { if( "" != Printerlib::result["stdout"]:"" ) + { scsi_device_list = Printerlib::result["stdout"]:""; + } + } + y2milestone( "scsi_device_list '%1'", scsi_device_list ); + content = `VBox + ( `Left + ( `ComboBox + ( `id(`scsi_device_node), + `opt(`editable), + // Label for an editable ComboBox where + // a SCSI generic device node (e.g. /dev/sg0 or /dev/sg1) + // can be selected or entered: + _("&SCSI generic device"), + [ // Have nothing preselected to be on the safe side because + // the CUPS scsi backend may blindly write to the device, + // (see backend/scsi-linux.c in the CUPS 1.3.9 sources): + `item( `id(""), "", true ), + `item( `id("/dev/sg0"), "/dev/sg0" ), + `item( `id("/dev/sg1"), "/dev/sg1" ), + `item( `id("/dev/sg2"), "/dev/sg2" ), + `item( `id("/dev/sg3"), "/dev/sg3" ), + `item( `id("/dev/sg4"), "/dev/sg4" ), + `item( `id("/dev/sg5"), "/dev/sg5" ), + `item( `id("/dev/sg6"), "/dev/sg6" ), + `item( `id("/dev/sg7"), "/dev/sg7" ) + ] + ) + ), + `Left + ( `Frame + ( // TRANSLATORS: Frame label for a list of SCSI generic devices: + _("Currently available SCSI generic devices"), + // The RichText widget is required here to get scroll bars if needed + // (a Label cuts the content because it does not provide scroll bars): + `RichText( "<pre>" + scsi_device_list + "</pre>" ) + ) + ), + model_for_using_driver_content + ); break; // network printer case(`tcp): @@ -497,7 +751,7 @@ default: y2error( "Unknown selected item %1", selected ); } - UI::ReplaceWidget( `rp, content ); + UI::ReplaceWidget( `connection_settings_replace_point, content ); } any ConnectionWizardDialog() @@ -520,14 +774,13 @@ // TRANSLATORS: Tree widget item `item(`id(`usb), _("USB Port") ), // TRANSLATORS: Tree widget item + `item( `id(`hplip), _("HP Devices (HPLIP)") ), + // TRANSLATORS: Tree widget item `item( `id(`serial), _("Serial Port") ), - // `item( `id(`infra), _("Infrared Port (IrDA)") ), // TRANSLATORS: Tree widget item `item( `id(`bluetooth), _("Bluetooth") ), // TRANSLATORS: Tree widget item - `item( `id(`scsi), _("SCSI") ), - // TRANSLATORS: Tree widget item - `item( `id(`hplip), _("HP Devices (HPLIP)") ) + `item( `id(`scsi), _("SCSI") ) ] ), `item @@ -582,7 +835,7 @@ `Frame ( // TRANSLATORS: Connection details widget _("Connection Settings"), - `ReplacePoint( `id(`rp), + `ReplacePoint( `id(`connection_settings_replace_point), `VBox ( `Left ( `Label @@ -625,10 +878,6 @@ switch(type) { case(`parallel): case(`usb): - case(`serial): - case(`infra): - case(`bluetooth): - case(`scsi): case(`hplip): integer selected_connection_index = (integer)UI::QueryWidget( `id(`connection_selection), `CurrentItem ); if( nil == selected_connection_index ) @@ -645,19 +894,99 @@ { valid = true; } break; + case(`serial): + string serial_device_node = (string)UI::QueryWidget( `serial_device_node, `Value ); + string serial_baud_rate = (string)UI::QueryWidget( `serial_baud_rate, `Value ); + string serial_data_bits = (string)UI::QueryWidget( `serial_data_bits, `Value ); + string serial_parity = (string)UI::QueryWidget( `serial_parity, `Value ); + string serial_flow_control = (string)UI::QueryWidget( `serial_flow_control, `Value ); + string serial_stop_bits = (string)UI::QueryWidget( `serial_stop_bits, `Value ); + if( size( serial_device_node ) == 0 + || size( serial_baud_rate ) == 0 + ) + { Popup::Error( _("Serial device and baud rate could not be empty.") ); + } + else + { if( "space" == serial_parity && "7" != serial_data_bits ) + { Popup::Error( _("The 'space' parity checking is only supported with 7 data bits.") ); + } + else + { if( "mark" == serial_parity && "7" != serial_data_bits ) + { Popup::Error( _("The 'mark' parity checking is only supported with 7 data bits.") ); + } + else + { connection_uri = "serial:" + serial_device_node + "?baud=" + serial_baud_rate; + if( size( serial_data_bits ) > 0 ) + { connection_uri = connection_uri + "+bits=" + serial_data_bits; + } + if( size( serial_parity ) > 0 ) + { connection_uri = connection_uri + "+parity=" + serial_parity; + } + if( size( serial_flow_control ) > 0 ) + { connection_uri = connection_uri + "+flow=" + serial_flow_control; + } + if( size( serial_stop_bits ) > 0 ) + { connection_uri = connection_uri + "+stop=" + serial_stop_bits; + } + valid = true; + } + } + } + if( valid ) + { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); + if( "" == connection_model ) + { valid = false; + Popup::Error( _("Select a manufacturer.") ); + } + } + break; + case(`bluetooth): + string bluetooth_device_id = (string)UI::QueryWidget( `bluetooth_device_id, `Value ); + if( size( bluetooth_device_id ) == 0 ) + { Popup::Error( _("Bluetooth device ID could not be empty.") ); + } + else + { connection_uri = "bluetooth://" + bluetooth_device_id; + valid = true; + } + if( valid ) + { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); + if( "" == connection_model ) + { valid = false; + Popup::Error( _("Select a manufacturer.") ); + } + } + break; + case(`scsi): + string scsi_device_node = (string)UI::QueryWidget( `scsi_device_node, `Value ); + if( size( scsi_device_node ) == 0 ) + { Popup::Error( _("SCSI generic device could not be empty.") ); + } + else + { connection_uri = "scsi:" + scsi_device_node; + valid = true; + } + if( valid ) + { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); + if( "" == connection_model ) + { valid = false; + Popup::Error( _("Select a manufacturer.") ); + } + } + break; case(`uri): connection_uri = (string)UI::QueryWidget( `uri, `Value ); if( size( connection_uri ) > 0 ) { valid = true; } else - { Popup::Error( _("URI couldn't be empty!") ); + { Popup::Error( _("URI could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -667,13 +996,13 @@ { valid = true; } else - { Popup::Error( _("URI couldn't be empty!") ); + { Popup::Error( _("URI could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -687,13 +1016,13 @@ if( size( smb["hostname"]:"" ) == 0 || size( smb["printer"]:"" ) == 0 ) - { Popup::Error( _("Servername and printer couldn't be empty!") ); + { Popup::Error( _("Servername and printer could not be empty.") ); } else { if( ( size( smb["user"]:"" ) > 0 && size( smb["pass"]:"" ) == 0 ) || ( size( smb["user"]:"" ) == 0 && size( smb["pass"]:"" ) > 0 ) ) - { Popup::Error( _("Both user and password must be specified!") ); + { Popup::Error( _("Both user and password must be specified.") ); } else { connection_uri = "smb://"; @@ -724,7 +1053,7 @@ { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -739,13 +1068,13 @@ valid = true; } else - { Popup::Error( _("Servername and port couldn't be empty!") ); + { Popup::Error( _("Servername and port could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -760,13 +1089,13 @@ valid=true; } else - { Popup::Error( _("Servername and queue name couldn't be empty!") ); + { Popup::Error( _("Servername and queue name could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -781,13 +1110,13 @@ valid=true; } else - { Popup::Error( _("Servername and queue name couldn't be empty!") ); + { Popup::Error( _("Servername and queue name could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -802,13 +1131,13 @@ valid=true; } else - { Popup::Error( _("Servername and queue name couldn't be empty!") ); + { Popup::Error( _("Servername and queue name could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -822,7 +1151,7 @@ if( size( ipx["hostname"]:"" ) == 0 || size( ipx["queue"]:"" ) == 0 ) - { Popup::Error( _("Servername and queue name couldn't be empty!") ); + { Popup::Error( _("Servername and queue name could not be empty.") ); } else { connection_uri = "novell://"; @@ -838,7 +1167,7 @@ { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid=false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -853,7 +1182,7 @@ || size( beh["attempts"]:"" ) == 0 || size( beh["delay"]:"" ) == 0 ) - { Popup::Error( _("Device URI, number of retries, and delay couldn't be empty!" ) ); + { Popup::Error( _("Device URI, number of retries, and delay could not be empty." ) ); } else { connection_uri = sformat( "beh:/%1/%2/%3/%4", @@ -868,7 +1197,7 @@ { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -879,13 +1208,13 @@ valid = true; } else - { Popup::Error( _("Couldn't be empty!") ); + { Popup::Error( _("Could not be empty.") ); } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); if( "" == connection_model ) { valid = false; - Popup::Error( _("Select a manufacturer!") ); + Popup::Error( _("Select a manufacturer.") ); } } break; @@ -1108,7 +1437,7 @@ storeQueue( selected ); } else - { y2error( "Couldn't validate %1", selected ); + { y2error( "Could not validate %1", selected ); ret=nil; } break; Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=569… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Thu Apr 23 16:26:54 2009 @@ -442,18 +442,31 @@ + "-[0-9]+'" ) ) - { if( Popup::AnyQuestion( // Header of a confirmation popup before all pending jobs in a queue will be deleted: - _("Delete Pending Print Jobs"), - // Body of a confirmation popup before a queue will be deleted: - _("There are pending print jobs which might be deleted before the testpage is printed."), - // 'Yes' button label of a confirmation popup - // before all pending jobs in a queue will be deleted: - sformat( _("Delete all pending jobs for %1"), queue_name ), - // 'No' button label of a confirmation popup - // before all pending jobs in a queue will be deleted: - _("Print the testpage after the other jobs"), - `focus_no - ) + { // Fallback body of a confirmation popup before pending print jobs will be deleted: + string pending_job_info = _("There are pending print jobs which might be deleted before the testpage is printed."); + if( Printerlib::ExecuteBashCommand( "/usr/bin/lpstat -h localhost -o '" + + queue_name + + "' -p '" + + queue_name + + "'" + ) + ) + { pending_job_info = Printerlib::result["stdout"]:""; + } + if( Popup::AnyQuestionRichText( // Header of a confirmation popup before pending print jobs will be deleted + // where %1 will be replaced by the queue name. + sformat( _("Delete Pending Print Jobs For %1"), queue_name ), + "<pre>" + pending_job_info + "</pre>", + 70, + 20, + // 'Yes' button label of a confirmation popup + // before all pending jobs in a queue will be deleted: + _("Delete them before printing testpage"), + // 'No' button label of a confirmation popup + // before all pending jobs in a queue will be deleted: + _("Print testpage after the other jobs"), + `focus_no + ) ) { if( ! Printerlib::ExecuteBashCommand( "/usr/bin/cancel -a -h localhost '" + queue_name + "'" ) ) { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails @@ -527,18 +540,31 @@ + "-[0-9]+'" ) ) - { if( Popup::AnyQuestion( // Header of a confirmation popup before all pending jobs in a queue will be deleted: - _("Delete Pending Print Jobs"), - // Body of a confirmation popup before a queue will be deleted: - _("There are pending print jobs which might be deleted now."), - // 'Yes' button label of a confirmation popup - // before all pending jobs in a queue will be deleted: - sformat( _("Delete all pending jobs for %1"), queue_name ), - // 'No' button label of a confirmation popup - // before all pending jobs in a queue will be deleted: - _("Do not delete them"), - `focus_no - ) + { // Fallback body of a confirmation popup before pending print jobs will be deleted: + string pending_job_info = _("There are pending print jobs which might be deleted now."); + if( Printerlib::ExecuteBashCommand( "/usr/bin/lpstat -h localhost -o '" + + queue_name + + "' -p '" + + queue_name + + "'" + ) + ) + { pending_job_info = Printerlib::result["stdout"]:""; + } + if( Popup::AnyQuestionRichText( // Header of a confirmation popup before pending print jobs will be deleted + // where %1 will be replaced by the queue name. + sformat( _("Delete Pending Print Jobs For %1"), queue_name ), + "<pre>" + pending_job_info + "</pre>", + 70, + 20, + // 'Yes' button label of a confirmation popup + // before all pending jobs in a queue will be deleted: + _("Delete all pending jobs"), + // 'No' button label of a confirmation popup + // before all pending jobs in a queue will be deleted: + _("Do not delete them"), + `focus_no + ) ) { if( ! Printerlib::ExecuteBashCommand( "/usr/bin/cancel -a -h localhost '" + queue_name + "'" ) ) { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails @@ -553,7 +579,9 @@ // Deal with the backend process regardless whether or not // the above cancel command was successful because // killing the backend process is an emergency brake - // when something is really wrong: + // when something is really wrong. + // Sleep 1 second in any case to let the backend process terminate orderly: + sleep( 1000 ); string backend_is_running_commandline = "ps -C '" + uri_scheme + "' -o pid=,args= | grep '" @@ -562,8 +590,8 @@ // Do nothing to be on the safe side if the next command fails for whatever reason: if( Printerlib::ExecuteBashCommand( backend_is_running_commandline ) ) { // A matching backend process is running. - // Sleep 10 seconds to let the backend process terminate orderly - // when the filters have finished because of the above cancel command. + // Sleep 10 seconds to give the backend process more time to terminate orderly + // which may still wait for the filters to finish because of the above cancel command. // There is no user feedback while waiting here because I assume that // the user expects that it takes a bit of time to delete all pending jobs. sleep( 10000 ); Modified: trunk/printer/src/policies.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/policies.ycp?rev=569… ============================================================================== --- trunk/printer/src/policies.ycp (original) +++ trunk/printer/src/policies.ycp Thu Apr 23 16:26:54 2009 @@ -67,11 +67,11 @@ ( `ComboBox ( `id("error_policy"), // Header for a ComboBox to specify the CUPS error policy: - _("Specify the &error policy"), - [ `item( `id("stop-printer"), error_policy_stop_printer_string ), - `item( `id("retry-job"), error_policy_retry_job_string ), - `item( `id("abort-job"), error_policy_abort_job_string ), - ] + _("Specify the &error policy"), + [ `item( `id("stop-printer"), error_policy_stop_printer_string ), + `item( `id("retry-job"), error_policy_retry_job_string ), + `item( `id("abort-job"), error_policy_abort_job_string ) + ] ) ), `Left @@ -90,8 +90,8 @@ ( `ComboBox ( `id("operation_policy"), // Header for a ComboBox to specify the CUPS operation policy: - _("Specify the &operation policy"), - [""] + _("Specify the &operation policy"), + [""] ) ), `Left -- 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] r56939 - /trunk/storage/storage/src/include/ep-lvm.ycp
by kmachalkova＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: kmachalkova Date: Thu Apr 23 16:20:43 2009 New Revision: 56939 URL: http://svn.opensuse.org/viewcvs/yast?rev=56939&view=rev Log: Function buttons for LVMs (these are also doing something at least a bit useful) Modified: trunk/storage/storage/src/include/ep-lvm.ycp Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Thu Apr 23 16:20:43 2009 @@ -69,6 +69,54 @@ ); } + void HandleLvmButtons( string device, map event ) + { + map dev = Storage::GetDiskPartition( device ); + string vg = (string) dev["disk"]:nil; + // FIXME: is this necessary & sufficient condition? + boolean is_vg = (dev["nr"]:"" == ""); + + switch (Event::IsWidgetActivated(event)) + { + case `add: + EpCreateLogicalVolume( vg ); + break; + + case `edit: + if ( is_vg ) + TreePanel::SwitchToNew( vg ); + else + EpEditLogicalVolume( device ); + break; + + case `resize: + if ( is_vg ) + EpResizeVolumeGroup( device); + else + EpResizeLogicalVolume ( device ); + break; + + case `delete: + if ( is_vg ) + EpDeleteVolumeGroup( device ); + else + EpDeleteLogicalVolume ( device, UI::WidgetExists(`id(`table)) ? `table : `overview ); + break; + } + + switch (Event::IsMenu( event )) + { + case `group: + EpCreateVolumeGroup(); + break; + + case `volume: + EpCreateLogicalVolume( vg ); + break; + } + } + + void CreateLvmMainPanel(any user_data) { symbol Predicate(map disk, map partition) @@ -116,17 +164,14 @@ void HandleLvmMainPanel(any user_data, map event) { - switch (Event::IsWidgetActivated(event)) - { - case `add: - EpCreateVolumeGroup(); - break; - } + string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); + HandleLvmButtons( device, event ); + + switch (Event::IsWidgetContextMenuActivated(event)) { case `table: - string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); EpContextMenuDevice(device); break; } @@ -162,17 +207,7 @@ { string device = (string) user_data; - switch (Event::IsWidgetActivated(event)) - { - case `resize: - EpResizeVolumeGroup(device); - break; - - case `delete: - EpDeleteVolumeGroup(device); - break; - } - + HandleLvmButtons( device, event ); UI::SetFocus(`id(`text)); } @@ -221,24 +256,7 @@ string vg_device = (string) user_data; string lv_device = (string) UI::QueryWidget(`id(`table), `CurrentItem); - switch (Event::IsWidgetActivated(event)) - { - case `add: - EpCreateLogicalVolume(vg_device); - break; - - case `edit: - EpEditLogicalVolume(lv_device); - break; - - case `resize: - EpResizeLogicalVolume(lv_device); - break; - - case `delete: - EpDeleteLogicalVolume(lv_device, `table); - break; - } + HandleLvmButtons( lv_device, event ); switch (Event::IsWidgetContextMenuActivated(event)) { @@ -356,19 +374,7 @@ { string device = (string) user_data; - switch (Event::IsWidgetActivated(event)) - { - case `edit: - EpEditLogicalVolume(device); - break; - - case `resize: - EpResizeLogicalVolume(device); - break; - - case `delete: - EpDeleteLogicalVolume(device, `overview); - break; - } + HandleLvmButtons( device, event ); + UI::SetFocus (`id(`text)); } } -- 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] r56938 - /trunk/storage/libstorage/src/Container.cc
by aschnell＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: aschnell Date: Thu Apr 23 16:18:35 2009 New Revision: 56938 URL: http://svn.opensuse.org/viewcvs/yast?rev=56938&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/Container.cc Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container… ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Thu Apr 23 16:18:35 2009 @@ -29,10 +29,7 @@ Container::~Container() { - for( PlainIterator i=begin(); i!=end(); i++ ) - { - delete( *i ); - } + clearPointerList(vols); y2deb("destructed cont " << dev); } -- 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] r56937 - in /trunk/storage/libstorage/src: Disk.cc DmPartCo.cc
by aschnell＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: aschnell Date: Thu Apr 23 16:18:26 2009 New Revision: 56937 URL: http://svn.opensuse.org/viewcvs/yast?rev=56937&view=rev Log: - fixed memory leak Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmPartCo.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Apr 23 16:18:26 2009 @@ -1898,6 +1898,7 @@ y2mil( "rem:" << *i ); if( !(*i)->created() ) { + delete *i; i = vols.erase( i ); } else Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Thu Apr 23 16:18:26 2009 @@ -642,6 +642,7 @@ y2mil( "rem:" << *i ); if( !(*i)->created() ) { + delete *i; i = vols.erase( i ); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0