Author: mzugec Date: Tue Feb 10 15:02:12 2009 New Revision: 55391 URL: http://svn.opensuse.org/viewcvs/yast?rev=55391&view=rev Log: enable cups autoconfig on 64-bit (bnc#464683) Modified: branches/SuSE-Code-11-Branch/printer/VERSION branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp Modified: branches/SuSE-Code-11-Branch/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/VERSION?rev=55391&r1=55390&r2=55391&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/printer/VERSION (original) +++ branches/SuSE-Code-11-Branch/printer/VERSION Tue Feb 10 15:02:12 2009 @@ -1 +1 @@ -2.17.52 +2.17.53 Modified: branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes?rev=55391&r1=55390&r2=55391&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes (original) +++ branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes Tue Feb 10 15:02:12 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 10 14:58:52 CET 2009 - mzugec@suse.cz + +- enable cups autoconfig on 64-bit (bnc#464683) +- 2.17.53 + +------------------------------------------------------------------- Tue Jan 27 16:21:19 CET 2009 - mzugec@suse.cz - one more string for translation (bnc#459414) Modified: branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp?rev=55391&r1=55390&r2=55391&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp (original) +++ branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp Tue Feb 10 15:02:12 2009 @@ -360,7 +360,13 @@ { // After the autoconfig settings have been successfully applied, // check if cups-autoconfig should run now: if( cups_autoconfig_triggered ) - { if( ! Printerlib::ExecuteBashCommand( "/usr/lib/cups-autoconfig/cups-autoconfig --add" ) ) + { // Depending on the architecture /usr/lib*/cups-autoconfig/cups-autoconfig could actually + // be /usr/lib/cups-autoconfig/cups-autoconfig (in SLE11 on i586, ia64, ppc, s390) + // or /usr/lib64/cups-autoconfig/cups-autoconfig (in SLE11 on ppc64, s390x, x86_64) + // or /usr/lib32/cups-autoconfig/cups-autoconfig (not in SLE11 but possible in a third-party package). + // If several /usr/lib*/cups-autoconfig/cups-autoconfig exist, simply the first one + // in the ls output which is /usr/lib/cups-autoconfig/cups-autoconfig is used here: + if( ! Printerlib::ExecuteBashCommand( "$( ls -1 /usr/lib*/cups-autoconfig/cups-autoconfig | head -n1 ) --add" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. _("Automatic configuration failed."), Printerlib::result["stderr"]:"" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org