April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56966 - /trunk/core/package/yast2-core.changes
by mvidner＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: mvidner Date: Fri Apr 24 13:35:45 2009 New Revision: 56966 URL: http://svn.opensuse.org/viewcvs/yast?rev=56966&view=rev Log: documented past changes Modified: trunk/core/package/yast2-core.changes Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Apr 24 13:35:45 2009 @@ -22,6 +22,15 @@ - added fix for problem with adding nil to list (bnc#216177) ------------------------------------------------------------------- +Fri Apr 15 12:00:00 CEST 2009 - mvidner(a)suse.cz + +- DBus service: + * handle variants in replies + * don't crash on unsupported types + * fixed ModuleManager action IDs + * more examples + +------------------------------------------------------------------- Fri Apr 10 09:52:42 CEST 2009 - lslezak(a)suse.cz - Merged the Yast DBus service from /tmp/lslezak/core branch, the -- 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] r56965 - in /trunk/core: agent-system/src/ShellCommand.cc liby2/src/Y2ProgramComponent.cc liby2/src/genericfrontend.cc liby2util-r/src/y2log.cc package/yast2-core.changes
by mvidner＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: mvidner Date: Fri Apr 24 13:24:09 2009 New Revision: 56965 URL: http://svn.opensuse.org/viewcvs/yast?rev=56965&view=rev Log: avoid y2log in both signal handler and forked children (bnc#493152) (applied coolo's hotfix from autobuild) Modified: trunk/core/agent-system/src/ShellCommand.cc trunk/core/liby2/src/Y2ProgramComponent.cc trunk/core/liby2/src/genericfrontend.cc trunk/core/liby2util-r/src/y2log.cc trunk/core/package/yast2-core.changes Modified: trunk/core/agent-system/src/ShellCommand.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-system/src/ShellComma… ============================================================================== --- trunk/core/agent-system/src/ShellCommand.cc (original) +++ trunk/core/agent-system/src/ShellCommand.cc Fri Apr 24 13:24:09 2009 @@ -117,7 +117,7 @@ FILE *stream2 = fdopen (pipe2[0], "r"); if (stream2 == 0) { - y2error ("stream2 fdopen error"); + y2error ("stream2 fdopen error"); _exit (1); } close (pipe2[1]); @@ -126,7 +126,8 @@ { if (out) fputs (s2, out); - y2debug ("%s", s2); + //bnc#493152#c24 + //y2debug ("%s", s2); } fclose (stream2); @@ -154,7 +155,7 @@ else ret = WTERMSIG (ret) + 128; - y2debug ("Exit status is %d", ret); + //y2debug ("Exit status is %d", ret); if (!tempdir.empty ()) { Modified: trunk/core/liby2/src/Y2ProgramComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2/src/Y2ProgramComponen… ============================================================================== --- trunk/core/liby2/src/Y2ProgramComponent.cc (original) +++ trunk/core/liby2/src/Y2ProgramComponent.cc Fri Apr 24 13:24:09 2009 @@ -291,13 +291,14 @@ // Call chroot if desired. if (chroot_path == "" || chroot_path == "/") { - y2debug ("Going to execute %s", bin_file.c_str ()); + //bnc#493152#c24 + //y2debug ("Going to execute %s", bin_file.c_str ()); } else { - y2debug ("Going to execute %s with chroot %s", bin_file.c_str (), - chroot_path.c_str ()); + /*y2debug ("Going to execute %s with chroot %s", bin_file.c_str (), + chroot_path.c_str ());*/ if (chroot (chroot_path.c_str ()) != 0) { - y2error ("Cannot chroot to %s: %s", chroot_path.c_str (), - strerror (errno)); + /*y2error ("Cannot chroot to %s: %s", chroot_path.c_str (), + strerror (errno));*/ _exit (5); } @@ -307,7 +308,7 @@ execv (bin_file.c_str (), argv); // execute program // this code is only reached if exec failed - y2error ("Cannot execute external program %s", bin_file.c_str ()); + //y2error ("Cannot execute external program %s", bin_file.c_str ()); _exit (5); // No sense in returning! I am forked away!! } Modified: trunk/core/liby2/src/genericfrontend.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2/src/genericfrontend.c… ============================================================================== --- trunk/core/liby2/src/genericfrontend.cc (original) +++ trunk/core/liby2/src/genericfrontend.cc Fri Apr 24 13:24:09 2009 @@ -210,12 +210,14 @@ signal_handler (int sig) { signal (sig, SIG_IGN); +/* // bnc#493152#c19 only signal-safe functions are allowed fprintf (stderr, "YaST got signal %d at YCP file %s:%d\n", sig, ee.filename ().c_str (), ee.linenumber ()); y2error ("got signal %d at YCP file %s:%d", sig, ee.filename ().c_str (), ee.linenumber ()); log_stored_debug (); log_backtrace (); +*/ // bye signal (sig, SIG_DFL); kill ( getpid (), sig); Modified: trunk/core/liby2util-r/src/y2log.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/y2log.cc?re… ============================================================================== --- trunk/core/liby2util-r/src/y2log.cc (original) +++ trunk/core/liby2util-r/src/y2log.cc Fri Apr 24 13:24:09 2009 @@ -119,7 +119,10 @@ FILE * newstderr = fdopen( dupstderr, "a" ); if ( newstderr == NULL ) { - fprintf( Y2LOG_STDERR, "y2log: Can't fdopen new stderr: %s.\n", strerror (errno) ); + char buf[100]; + //bnc#493152#c22 + strerror_r(errno, buf, sizeof(buf)-1); + fprintf( Y2LOG_STDERR, "y2log: Can't fdopen new stderr: %s.\n", buf); } else { fcntl (fileno (newstderr), F_SETFD, fcntl (fileno (newstderr), F_GETFD) | FD_CLOEXEC); @@ -127,7 +130,9 @@ } } else { - fprintf( Y2LOG_STDERR, "y2log: Can't dup stderr: %s.\n", strerror (errno) ); + char buf[100]; + strerror_r(errno, buf, sizeof(buf)-1); + fprintf( Y2LOG_STDERR, "y2log: Can't dup stderr: %s.\n", buf ); } return 1; } @@ -145,8 +150,10 @@ logfile = fopen (logname, "a"); } if (!logfile && !log_simple) { + char buf[100]; + strerror_r(errno, buf, sizeof(buf)-1); fprintf (Y2LOG_STDERR, "y2log: Error opening logfile '%s': %s.\n", - logname, strerror (errno)); + logname, buf); return NULL; } } @@ -244,17 +251,19 @@ #if 1 // just 1 second precision time_t timestamp = time (NULL); - struct tm *brokentime = localtime (&timestamp); + struct tm brokentime; + localtime_r (&timestamp, &brokentime); char date[50]; // that's big enough - strftime (date, sizeof (date), Y2LOG_DATE, brokentime); + strftime (date, sizeof (date), Y2LOG_DATE, &brokentime); #else // 1 millisecond precision (use only for testing) timeval time; gettimeofday (&time, NULL); time_t timestamp = time.tv_sec; - struct tm *brokentime = localtime (&timestamp); + struct tm brokentime; + localtime_r (&timestamp, &brokentime); char tmp1[50], date[50]; // that's big enough - strftime (tmp1, sizeof (tmp1), Y2LOG_DATE, brokentime); + strftime (tmp1, sizeof (tmp1), Y2LOG_DATE, &brokentime); snprintf (date, sizeof (date), "%s.%03ld", tmp1, time.tv_usec / 1000); #endif Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Apr 24 13:24:09 2009 @@ -7,6 +7,11 @@ - 2.18.7 ------------------------------------------------------------------- +Tue Apr 21 14:40:31 CEST 2009 - coolo(a)suse.de + +- avoid y2log in both signal handler and forked children (bnc#493152) + +------------------------------------------------------------------- Mon Apr 20 09:50:37 CEST 2009 - jreidinger(a)suse.cz - add builtin list::swap for list -- 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] r56964 - in /trunk/theme: SLE/icons/16x16/apps/ SLE/icons/22x22/apps/ SLE/icons/256x256/ SLE/icons/256x256/apps/ SLE/icons/32x32/apps/ SLE/icons/48x48/apps/ openSUSE/icons/16x16/apps/ openSUSE/icon...
by jimmacfx＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: jimmacfx Date: Fri Apr 24 12:36:12 2009 New Revision: 56964 URL: http://svn.opensuse.org/viewcvs/yast?rev=56964&view=rev Log: Updated the SMT icon based on the wishes of locilka and federico. Added: trunk/theme/SLE/icons/16x16/apps/yast-SMT.png (with props) trunk/theme/SLE/icons/256x256/ trunk/theme/SLE/icons/256x256/apps/ trunk/theme/SLE/icons/256x256/apps/yast-SMT.png (with props) trunk/theme/openSUSE/icons/16x16/apps/yast-SMT.png (with props) trunk/theme/openSUSE/icons/256x256/ trunk/theme/openSUSE/icons/256x256/apps/ trunk/theme/openSUSE/icons/256x256/apps/yast-SMT.png (with props) Modified: trunk/theme/SLE/icons/22x22/apps/yast-SMT.png trunk/theme/SLE/icons/32x32/apps/yast-SMT.png trunk/theme/SLE/icons/48x48/apps/yast-SMT.png trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png Added: trunk/theme/SLE/icons/16x16/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/16x16/apps/yast-… ============================================================================== Binary file - no diff available. Modified: trunk/theme/SLE/icons/22x22/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/22x22/apps/yast-… ============================================================================== Binary files - no diff available. Added: trunk/theme/SLE/icons/256x256/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/256x256/apps/yas… ============================================================================== Binary file - no diff available. Modified: trunk/theme/SLE/icons/32x32/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/32x32/apps/yast-… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/48x48/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/48x48/apps/yast-… ============================================================================== Binary files - no diff available. Added: trunk/theme/openSUSE/icons/16x16/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary file - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png (original) and trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png Fri Apr 24 12:36:12 2009 differ Added: trunk/theme/openSUSE/icons/256x256/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/256x256/app… ============================================================================== Binary file - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png (original) and trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png Fri Apr 24 12:36:12 2009 differ Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png (original) and trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png Fri Apr 24 12:36:12 2009 differ -- 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] r56963 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: aschnell Date: Fri Apr 24 12:34:13 2009 New Revision: 56963 URL: http://svn.opensuse.org/viewcvs/yast?rev=56963&view=rev Log: - use boost function - some cleanup Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Apr 24 12:34:13 2009 @@ -579,7 +579,7 @@ { enum DTyp { DISK, DASD, XEN }; - DiskData( const string& n, DTyp t, unsigned long long sz ) { d=0; s=sz; typ=t; name=n; } + DiskData( const string& n, DTyp t, unsigned long long sz ) : d(NULL) { s=sz; typ=t; name=n; } Disk* d; DTyp typ; @@ -602,13 +602,7 @@ Storage::initDisk( DiskData& data, ProcPart& pp ) { y2mil( "data:" << data ); - data.dev = data.name; - string::size_type pos = data.dev.find('!'); - while( pos!=string::npos ) - { - data.dev[pos] = '/'; - pos = data.dev.find('!',pos+1); - } + data.dev = boost::replace_all_copy(data.name, "!", "/"); y2mil("name sysfs:" << data.name << " parted:" << data.dev); Disk * d = NULL; switch( data.typ ) @@ -638,7 +632,7 @@ { data.d = d; } - else if( d ) + else { delete d; } @@ -707,7 +701,7 @@ initDisk( *i, ppart ); } y2mil( "dl: " << dl ); - for( list<DiskData>::iterator i = dl.begin(); i!=dl.end(); ++i ) + for( list<DiskData>::const_iterator i = dl.begin(); i!=dl.end(); ++i ) { if( i->d ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56962 - /tags/stable-2_18_14/printer/
by jsmeix＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: jsmeix Date: Fri Apr 24 12:33:22 2009 New Revision: 56962 URL: http://svn.opensuse.org/viewcvs/yast?rev=56962&view=rev Log: Created tag stable-2_18_14 for printer Added: tags/stable-2_18_14/printer/ - copied from r56961, 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] r56961 - in /trunk/printer: VERSION package/yast2-printer.changes src/connectionwizard.ycp src/helps.ycp
by jsmeix＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: jsmeix Date: Fri Apr 24 12:33:14 2009 New Revision: 56961 URL: http://svn.opensuse.org/viewcvs/yast?rev=56961&view=rev Log: - Fixed the Connection Wizard which now checks for each connection which is not natively supported by CUPS if the RPM package which provides the matching CUPS backend is installed. - 2.18.14 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/connectionwizard.ycp trunk/printer/src/helps.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=56961&r1=569… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Apr 24 12:33:14 2009 @@ -1 +1 @@ -2.18.13 +2.18.14 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 Fri Apr 24 12:33:14 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Apr 24 10:42:09 CEST 2009 - jsmeix(a)suse.de + +- Fixed the Connection Wizard which now checks for each connection + which is not natively supported by CUPS if the RPM package + which provides the matching CUPS backend is installed. +- 2.18.14 + +------------------------------------------------------------------- Thu Apr 23 13:24:07 CEST 2009 - jsmeix(a)suse.de - When printing a testpage in the Overview dialog, explicitely 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 Fri Apr 24 12:33:14 2009 @@ -209,6 +209,26 @@ content = getContentFromBackend("usb"); break; case(`hplip): + if( ! Printerlib::TestAndInstallPackage( "hplip", "installed" ) ) + // Only a notification but no installation of HPLIP in the Connection Wizard. + // Installing the package hplip can pull in tons of required packages + // because the hplip package does not only provide the 'hp' backend but is a + // full featured multifunction solution with GUI for HP printers and all-in-one devices. + // HPLIP supports printing, scanning, faxing, photo card access, and device management. + // Additionally installing hplip can become very complicated (see driveradd.ycp). + // Therefore the Connection Wizard is not bloated with installing HPLIP. + { Popup::Message( // Popup::Message when the user had selected "HP Devices (HPLIP)" + // in the Connection Wizard but the RPM package hplip is not installed: + _("To access a HP device via the 'hp' backend,\nthe RPM package hplip must be installed.") + ); + content = `VBox + ( `Left + ( `Label + ( _("The RPM package hplip is not installed.") ) + ) + ); + break; + } content = getContentFromBackend("hp"); break; case(`serial): @@ -325,11 +345,10 @@ // 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" ) + `item( `id("soft"), "XON/XOFF (software)" ), + `item( `id("hard"), "RTS/CTS (hardware)" ), + `item( `id("dtrdsr"), "DTR/DSR (hardware)" ) ] ) ), @@ -356,9 +375,26 @@ ); break; case(`bluetooth): + if( ! Printerlib::TestAndInstallPackage( "bluez-cups", "installed" ) ) + { if( Popup::ContinueCancel( _("To access a bluetooth printer, the RPM package bluez-cups must be installed.") ) ) + { Printerlib::TestAndInstallPackage( "bluez-cups", "install" ); + } + // The user can also decide during the actual installation not to install it + // or the installation may have failed for whatever reason + // so that we test again whether or not it is now actually installed: + if( ! Printerlib::TestAndInstallPackage( "bluez-cups", "installed" ) ) + { content = `VBox + ( `Left + ( `Label + ( _("The RPM package bluez-cups is not installed.") ) + ) + ); + break; + } + } // 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."); + string bluetooth_device_list = _("It seems there are no bluetooth device IDs.\nRun 'hcitool scan' to get the bluetooth device IDs.\nEnter the ID without colons like '1A2B3C4D5E6F'."); Popup::ShowFeedback( // No title for a simple busy message: "", // Busy message: @@ -428,9 +464,10 @@ case(`scsi): // 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: + string scsi_device_list = _("It seems there are no SCSI generic devices (/dev/sg...).\nRun 'lsscsi -g' to get a list of SCSI generic devices."); + if( ! Printerlib::ExecuteBashCommand( "lsscsi -g | tr -s ' ' | cut -s -d ' ' -f 3- | grep '/dev/sg' || echo 'no SCSI generic device found' 1>&2" ) ) + { // Will probably never fail because the final "echo" should exit successfully in any case: + Popup::ErrorDetails( // Popup::ErrorDetails message: _("Failed to get a list of SCSI generic devices."), "lsscsi -g" + "\n" + Printerlib::result["stderr"]:"" ); @@ -515,6 +552,23 @@ break; // print via case(`smb): + if( ! Printerlib::TestAndInstallPackage( "samba-client", "installed" ) ) + { if( Popup::ContinueCancel( _("To access a SMB printer share, the RPM package samba-client must be installed.") ) ) + { Printerlib::TestAndInstallPackage( "samba-client", "install" ); + } + // The user can also decide during the actual installation not to install it + // or the installation may have failed for whatever reason + // so that we test again whether or not it is now actually installed: + if( ! Printerlib::TestAndInstallPackage( "samba-client", "installed" ) ) + { content = `VBox + ( `Left + ( `Label + ( _("The RPM package samba-client is not installed.") ) + ) + ); + break; + } + } content = `VBox ( `Left ( `HBox @@ -629,6 +683,23 @@ ); break; case(`ipx): + if( ! Printerlib::TestAndInstallPackage( "ncpfs", "installed" ) ) + { if( Popup::ContinueCancel( _("To access an IPX print queue, the RPM package ncpfs must be installed.") ) ) + { Printerlib::TestAndInstallPackage( "ncpfs", "install" ); + } + // The user can also decide during the actual installation not to install it + // or the installation may have failed for whatever reason + // so that we test again whether or not it is now actually installed: + if( ! Printerlib::TestAndInstallPackage( "ncpfs", "installed" ) ) + { content = `VBox + ( `Left + ( `Label + ( _("The RPM package ncpfs is not installed.") ) + ) + ); + break; + } + } content = `VBox ( `Left ( `InputField @@ -688,6 +759,23 @@ ); break; case(`pipe): + if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) + { if( Popup::ContinueCancel( _("To print via 'pipe', the RPM package cups-backends must be installed.") ) ) + { Printerlib::TestAndInstallPackage( "cups-backends", "install" ); + } + // The user can also decide during the actual installation not to install it + // or the installation may have failed for whatever reason + // so that we test again whether or not it is now actually installed: + if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) + { content = `VBox + ( `Left + ( `Label + ( _("The RPM package cups-backends is not installed.") ) + ) + ); + break; + } + } content = `VBox ( `Left ( `InputField @@ -700,6 +788,23 @@ ); break; case(`beh): + if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) + { if( Popup::ContinueCancel( _("To use 'beh', the RPM package cups-backends must be installed.") ) ) + { Printerlib::TestAndInstallPackage( "cups-backends", "install" ); + } + // The user can also decide during the actual installation not to install it + // or the installation may have failed for whatever reason + // so that we test again whether or not it is now actually installed: + if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) + { content = `VBox + ( `Left + ( `Label + ( _("The RPM package cups-backends is not installed.") ) + ) + ); + break; + } + } model_content = getContentFromCurrentModel(); content = `VBox ( `Left @@ -911,8 +1016,8 @@ { 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.") ); + { if( "mark" == serial_parity && "7" != serial_data_bits && "1" != serial_stop_bits ) + { Popup::Error( _("The 'mark' parity checking is only supported with 7 data bits and 1 stop bit.") ); } else { connection_uri = "serial:" + serial_device_node + "?baud=" + serial_baud_rate; Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=56961&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Fri Apr 24 12:33:14 2009 @@ -410,7 +410,23 @@ hp:/usb/HP_LaserJet?serial=1234 Usually only the autogenerated device URIs work. When the device is not autodetected, there is usually no communication -with the device possible and no data can be sent to the device. +with the device possible and no data can be sent to the device. +To access a HP printer or all-in-one device via the backend 'hp', +the RPM package hplip must be installed. +The package provides HP's printing and scanning software HPLIP. +In contrast devices which are connected via serial port, bluetooth, +or SCSI are usually not autodetected so that the device URI must be +manually specified. +The serial device URI parameters must comply with +what the serial port in the printer requires, +see the manual of your serial printer. +Example device URIs: +serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1 +bluetooth://1A2B3C4D5E6F +scsi:/dev/sg9 +To access a device via bluetooth, the RPM package bluez-cups must be installed. +The package provides the CUPS backend 'bluetooth' which actually sends the data +to a bluetooth printer. ") + // ConnectionWizardDialog help 4/6: _(" @@ -458,6 +474,10 @@ Ask your network administrator what which print server machine provides in your particular network: Microsoft Windows/SAMBA (SMB/CIFS) +To access a SMB printer share, the RPM package samba-client must be installed. +The package provides the CUPS backend 'smb' which is a link to +the <tt>/usr/bin/smbspool</tt> program which actually sends the data +to a SMB printer share. A server name and a printer share name and optionally a workgroup name is needed to access it. Furthermore a user name and a password may be required to get access. -- 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] r56960 - in /trunk/bootloader/src: modules/Bootloader.ycp routines/misc.ycp
by juhliarik＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: juhliarik Date: Fri Apr 24 11:42:22 2009 New Revision: 56960 URL: http://svn.opensuse.org/viewcvs/yast?rev=56960&view=rev Log: fix using find Modified: trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Apr 24 11:42:22 2009 @@ -1411,7 +1411,7 @@ map out = (map)WFM::Execute(.local.bash_output, cmd); - if (find(out["stdout"]:"", "VirtualBox") != -1) + if (search(out["stdout"]:"", "VirtualBox") != nil) { y2milestone ("Installation run on VirtualBox, skip kexec loading: %1", out); return false; @@ -1428,7 +1428,7 @@ // find default section in BootCommon::sections foreach(map<string,any> section, BootCommon::sections, { - if ((find(tostring(section["name"]:""),name) != -1) + if ((search(tostring(section["name"]:""),name) != nil) && (section["root"]:nil == linux_default["root"]:nil) && (section["original_name"]:"" != "failsafe")) { 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 Fri Apr 24 11:42:22 2009 @@ -404,7 +404,7 @@ // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader string result = examineMBR(device); - if ((search(result, "grub") != nil) || ((search(result, "lilo") != nil)) + if ((search(result, "grub") != nil) || (search(result, "lilo") != nil)) return true; else return 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] r56959 - /trunk/bootloader/src/routines/misc.ycp
by juhliarik＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: juhliarik Date: Fri Apr 24 11:07:52 2009 New Revision: 56959 URL: http://svn.opensuse.org/viewcvs/yast?rev=56959&view=rev Log: update detection of MBR content Modified: trunk/bootloader/src/routines/misc.ycp 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 Fri Apr 24 11:07:52 2009 @@ -404,7 +404,10 @@ // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader string result = examineMBR(device); - return search(result, "stage1") != nil ? true : false; + if ((search(result, "grub") != nil) || ((search(result, "lilo") != nil)) + return true; + else + return 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] r56958 - /tags/stable-2_18_7/core/
by lslezak＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: lslezak Date: Fri Apr 24 09:06:42 2009 New Revision: 56958 URL: http://svn.opensuse.org/viewcvs/yast?rev=56958&view=rev Log: Created tag stable-2_18_7 for core Added: tags/stable-2_18_7/core/ (props changed) - copied from r56957, trunk/core/ -- 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] r56957 - in /trunk/core: ./ dbus/namespace_service/doc/ dbus/namespace_service/src/ package/
by lslezak＠svn.opensuse.org 24 Apr '09

24 Apr '09

Author: lslezak Date: Fri Apr 24 09:06:20 2009 New Revision: 56957 URL: http://svn.opensuse.org/viewcvs/yast?rev=56957&view=rev Log: - DBus service - better handle "::" separators in name space string - replace it by "/" in DBus object path and "." in PolicyKit action ID string - 2.18.7 Added: trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy (contents, props changed) - copied, changed from r56956, trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy Removed: trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy Modified: trunk/core/VERSION trunk/core/dbus/namespace_service/doc/Makefile.am trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples trunk/core/dbus/namespace_service/doc/dbus_samba_export.README trunk/core/dbus/namespace_service/doc/dbus_samba_export.py trunk/core/dbus/namespace_service/doc/example-users.py trunk/core/dbus/namespace_service/src/DBusModulesServer.cc trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=56957&r1=56956&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Apr 24 09:06:20 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/core/dbus/namespace_service/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/… ============================================================================== --- trunk/core/dbus/namespace_service/doc/Makefile.am (original) +++ trunk/core/dbus/namespace_service/doc/Makefile.am Fri Apr 24 09:06:20 2009 @@ -12,7 +12,7 @@ example-arch.py \ example-users.py \ polkit_helper.py \ - org.opensuse.yast.modules.yapi-samba.policy \ + org.opensuse.yast.modules.yapi.samba.policy \ YaPI_Samba.examples EXTRA_DIST = $(html_DATA) Modified: trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/… ============================================================================== --- trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples (original) +++ trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples Fri Apr 24 09:06:20 2009 @@ -4,29 +4,29 @@ How to use the examples: -1. Copy org.opensuse.yast.modules.yapi-samba.policy file to /usr/share/PolicyKit/policy +1. Copy org.opensuse.yast.modules.yapi.samba.policy file to /usr/share/PolicyKit/policy directory. (Note: the file should be later moved to yast2-samba-server package.) 2. The service will return an authorization error if you are not authorized to call an exported function. - Use e.g. 'polkit-auth --obtain org.opensuse.yast.modules.yapi-samba.addshare' call to obtain + Use e.g. 'polkit-auth --obtain org.opensuse.yast.modules.yapi.samba.addshare' call to obtain the 'addshare' authorization. Call the exported function again after obtaing the authorization, this time it should succeed. 3. Try the following Bus calls: # YaPI::Samba::GetServiceStatus() - get service status (enabled/disabled in default runlevels) -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.GetServiceStatus +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.GetServiceStatus # YaPI::Samba::EnableService(boolean enable) - enable samba service -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.EditService boolean:true +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.EditService boolean:true # YaPI::Samba::GetAllDirectories() - get list of all configured shares -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.GetAllDirectories +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.GetAllDirectories # YaPI::Samba::AddShare(sting name, map options) - add a new read-only share "local" # check the end of /etc/samba/smb.conf file, there should be a new section -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.AddShare string:"local" dict:string:string:"path","/local","comment","Exported /local directory","read only","Yes" +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.AddShare string:"local" dict:string:string:"path","/local","comment","Exported /local directory","read only","Yes" # YaPI::Samba::GetShare(string name) - get properties of share "local" -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.GetShare string:"local" +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.GetShare string:"local" Modified: trunk/core/dbus/namespace_service/doc/dbus_samba_export.README URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/… ============================================================================== --- trunk/core/dbus/namespace_service/doc/dbus_samba_export.README (original) +++ trunk/core/dbus/namespace_service/doc/dbus_samba_export.README Fri Apr 24 09:06:20 2009 @@ -7,7 +7,7 @@ cp dbus_samba_export.py /usr/bin If the Samba server has been configured (by the system administrator) users who -have org.opensuse.yast.modules.yapi-samba.addshare PolicyKit authorization can +have org.opensuse.yast.modules.yapi.samba.addshare PolicyKit authorization can simply export a directory using Konqueror or Dolphin file manager. Just right-click on a folder, select "Actions" -> "Export directory as a Samba Modified: trunk/core/dbus/namespace_service/doc/dbus_samba_export.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/… ============================================================================== --- trunk/core/dbus/namespace_service/doc/dbus_samba_export.py (original) +++ trunk/core/dbus/namespace_service/doc/dbus_samba_export.py Fri Apr 24 09:06:20 2009 @@ -30,7 +30,7 @@ share_name = share_name[1:] bus = dbus.SystemBus() - samba = bus.get_object('org.opensuse.YaST.modules', '/org/opensuse/YaST/modules/YaPI__Samba') + samba = bus.get_object('org.opensuse.YaST.modules', '/org/opensuse/YaST/modules/YaPI/Samba') call = lambda: samba.AddShare(share_name, {'path':directory, 'comment':'Exported directory ' + directory, 'read only':'Yes'}, dbus_interface='org.opensuse.YaST.Values') Modified: trunk/core/dbus/namespace_service/doc/example-users.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/… ============================================================================== --- trunk/core/dbus/namespace_service/doc/example-users.py (original) +++ trunk/core/dbus/namespace_service/doc/example-users.py Fri Apr 24 09:06:20 2009 @@ -3,7 +3,7 @@ # see example-arch.py # # As root: -# # polkit-auth --user $USER --grant org.opensuse.yast.modules.yapi-users.usersget +# # polkit-auth --user $USER --grant org.opensuse.yast.modules.yapi.users.usersget # work around a bug in yast2-core-2.18.6: # # polkit-auth --user $USER --grant org.opensuse.yast.module-manager.modules.import @@ -22,7 +22,7 @@ # polkit will ask retry(lambda: mm.Import('YaPI::USERS')) -Users_o = O(MOD_S, '/org/opensuse/YaST/modules/YaPI__USERS') +Users_o = O(MOD_S, '/org/opensuse/YaST/modules/YaPI/USERS') Users = I(Users_o, 'org.opensuse.YaST.Values') cfg = { "type": "system", Copied: trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy (from r56956, trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/… ============================================================================== --- trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy (original) +++ trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy Fri Apr 24 09:06:20 2009 @@ -6,7 +6,7 @@ <vendor>Novell, Inc.</vendor> <vendor_url>http://www.novell.com</vendor_url> - <action id="org.opensuse.yast.modules.yapi-samba.getalldirectories"> + <action id="org.opensuse.yast.modules.yapi.samba.getalldirectories"> <description>Get list of all Samba shares.</description> <message>System policy prevents the Yast DBus service from reading all Samba exports.</message> @@ -17,7 +17,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.addshare"> + <action id="org.opensuse.yast.modules.yapi.samba.addshare"> <description>Add a new Samba share.</description> <message>System policy prevents the Yast DBus service from adding a new Samba share.</message> @@ -28,7 +28,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.editshare"> + <action id="org.opensuse.yast.modules.yapi.samba.editshare"> <description>Edit properties of a Samba share.</description> <message>System policy prevents the Yast DBus service from editing properties a Samba share.</message> @@ -39,7 +39,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.deleteshare"> + <action id="org.opensuse.yast.modules.yapi.samba.deleteshare"> <description>Delete a Samba share.</description> <message>System policy prevents the Yast DBus service from deleting a Samba share.</message> @@ -50,7 +50,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.enableshare"> + <action id="org.opensuse.yast.modules.yapi.samba.enableshare"> <description>Enable or disablea a Samba share.</description> <message>System policy prevents the Yast DBus service from enabling or disabling a Samba share.</message> @@ -61,7 +61,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.getshare"> + <action id="org.opensuse.yast.modules.yapi.samba.getshare"> <description>Get details about a Samba share</description> <message>System policy prevents the Yast DBus service from reading properties of a Samba share.</message> @@ -72,7 +72,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.getshareenabled"> + <action id="org.opensuse.yast.modules.yapi.samba.getshareenabled"> <description>Get status of a Samba share (enabled/disabled)</description> <message>System policy prevents the Yast DBus service from reading status of a Samba share.</message> Modified: trunk/core/dbus/namespace_service/src/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/src/… ============================================================================== --- trunk/core/dbus/namespace_service/src/DBusModulesServer.cc (original) +++ trunk/core/dbus/namespace_service/src/DBusModulesServer.cc Fri Apr 24 09:06:20 2009 @@ -36,17 +36,41 @@ } } -void MakeValidObjectName(std::string &name) +std::string MakeValidObjectName(const std::string &name) { - for(std::string::iterator it = name.begin(); + std::string ret; + // optimization: preallocate enough space, avoid memory reallocations + ret.reserve(name.size()); + + for(std::string::const_iterator it = name.begin(); it != name.end(); ++it) { + // replace "::" -> "/" + if (*it == ':') + { + std::string::const_iterator it2(it); + it2++; + + if (it2 != name.end() && *it2 == ':') + { + ret += '/'; + it++; + continue; + } + } + if (!isupper(*it) && !islower(*it) && (*it) != '_') { - *it = '_'; + ret += '_'; + } + else + { + ret += *it; } } + + return ret; } bool DBusModulesServer::importNamespace(const std::string &nspace) @@ -72,7 +96,7 @@ { ns->initialize(); std::string objname(nspace); - MakeValidObjectName(objname); + objname = MakeValidObjectName(objname); y2milestone("Imported name space: %s, using object name: %s", nspace.c_str(), objname.c_str()); @@ -132,7 +156,7 @@ } std::string namespace_str(nspace); - MakeValidObjectName(namespace_str); + namespace_str = MakeValidObjectName(namespace_str); if (params_ok_raw) { @@ -623,13 +647,27 @@ obj.erase(obj.size() - 1); } - obj.erase(0, obj.rfind("/")); + // remove the object prefix path + obj.erase(0, sizeof(YAST_DBUS_OBJ_PREFIX)); if (!obj.empty() && obj[0] == '/') { obj.erase(obj.begin()); } + for(std::string::iterator it = obj.begin(); + it != obj.end(); + ++it) + { + // replace "/" -> "." + if (*it == '/') + { + *it = '.'; + } + } + + y2debug("Object path for PolicyKit action: %s", obj.c_str()); + if (!obj.empty()) { ret += '.' + obj; Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Apr 24 09:06:20 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Apr 24 08:40:07 CEST 2009 - lslezak(a)suse.cz + +- DBus service - better handle "::" separators in name space + string - replace it by "/" in DBus object path and "." in + PolicyKit action ID string +- 2.18.7 + +------------------------------------------------------------------- Mon Apr 20 09:50:37 CEST 2009 - jreidinger(a)suse.cz - add builtin list::swap for list -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0