April 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r61597 - /tags/branch-Code-11-SP1-2_17_73/installation/
by locilka＠svn.opensuse.org 07 Apr '10

07 Apr '10

Author: locilka Date: Wed Apr 7 10:24:16 2010 New Revision: 61597 URL: http://svn.opensuse.org/viewcvs/yast?rev=61597&view=rev Log: Created tag branch-Code-11-SP1-2_17_73 for installation Added: tags/branch-Code-11-SP1-2_17_73/installation/ (props changed) - copied from r61596, branches/SuSE-Code-11-SP1-Branch/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61596 - in /branches/SuSE-Code-11-SP1-Branch/installation: VERSION package/yast2-installation.changes src/clients/copy_files_finish.ycp
by locilka＠svn.opensuse.org 07 Apr '10

07 Apr '10

Author: locilka Date: Wed Apr 7 10:23:14 2010 New Revision: 61596 URL: http://svn.opensuse.org/viewcvs/yast?rev=61596&view=rev Log: - Searching for LiveCD license in /usr/share/doc/licenses and / directories (BNC #594042). Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Wed Apr 7 10:23:14 2010 @@ -1 +1 @@ -2.17.72 +2.17.73 Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Wed Apr 7 10:23:14 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 6 17:44:25 CEST 2010 - locilka(a)suse.cz + +- Searching for LiveCD license in /usr/share/doc/licenses and / + directories (BNC #594042). +- 2.17.73 + +------------------------------------------------------------------- Wed Mar 24 07:44:44 UTC 2010 - lslezak(a)suse.cz - inst_suseconfig.ycp - do not reset UI product name Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp Wed Apr 7 10:23:14 2010 @@ -191,21 +191,31 @@ y2milestone ("Using license dir: %1", license_dir); } - string license_file = "/license.tar.gz"; - // Copy licenses so it can be used in firstboot later - // bnc #396976 - map cmd = (map) WFM::Execute (.local.bash_output, - sformat ( - "mkdir -p '%1' && cd '%1' && rm -rf license*.txt; tar -xf '%2'", - String::Quote (license_dir), - String::Quote (license_file) - ) - ); - if (cmd["exit"]:-1 == 0) { - y2milestone ("Copying %1 to %2 was successful", license_file, license_dir); - } else { - y2error ("Copying %1 to %2 has failed: %3", license_file, license_dir, cmd); - } + // BNC #594042: Multiple license locations + list <string> license_locations = ["/usr/share/doc/licenses/", "/"]; + + foreach (string license_location, license_locations, { + license_location = sformat ("%1/license.tar.gz", license_location); + + if (! FileUtils::Exists (license_location)) return; + + // Copy licenses so it can be used in firstboot later + // bnc #396976 + map cmd = (map) WFM::Execute (.local.bash_output, + sformat ( + "mkdir -p '%1' && cd '%1' && rm -rf license*.*; cd '%1' && tar -xf '%2'", + String::Quote (license_dir), + String::Quote (license_location) + ) + ); + if (cmd["exit"]:-1 == 0) { + y2milestone ("Copying %1 to %2 was successful", license_location, license_dir); + } else { + y2error ("Copying %1 to %2 has failed: %3", license_location, license_dir, cmd); + } + + break; + }); // bugzila #328126 // Copy 70-persistent-cd.rules ... if not updating -- 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] r61595 - in /trunk/installation: package/yast2-installation.changes src/inst_finish/copy_files_finish.ycp
by locilka＠svn.opensuse.org 07 Apr '10

07 Apr '10

Author: locilka Date: Wed Apr 7 10:22:43 2010 New Revision: 61595 URL: http://svn.opensuse.org/viewcvs/yast?rev=61595&view=rev Log: - Searching for LiveCD license in /usr/share/doc/licenses and / directories (BNC #594042). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/copy_files_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 7 10:22:43 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 6 17:44:25 CEST 2010 - locilka(a)suse.cz + +- Searching for LiveCD license in /usr/share/doc/licenses and / + directories (BNC #594042). + +------------------------------------------------------------------- Fri Mar 26 11:26:04 CET 2010 - ug(a)suse.de - fixed a broken yast2-installation.spec.in Modified: trunk/installation/src/inst_finish/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/cop… ============================================================================== --- trunk/installation/src/inst_finish/copy_files_finish.ycp (original) +++ trunk/installation/src/inst_finish/copy_files_finish.ycp Wed Apr 7 10:22:43 2010 @@ -191,21 +191,31 @@ y2milestone ("Using license dir: %1", license_dir); } - string license_file = "/license.tar.gz"; - // Copy licenses so it can be used in firstboot later - // bnc #396976 - map cmd = (map) WFM::Execute (.local.bash_output, - sformat ( - "mkdir -p '%1' && cd '%1' && rm -rf license*.txt; tar -xf '%2'", - String::Quote (license_dir), - String::Quote (license_file) - ) - ); - if (cmd["exit"]:-1 == 0) { - y2milestone ("Copying %1 to %2 was successful", license_file, license_dir); - } else { - y2error ("Copying %1 to %2 has failed: %3", license_file, license_dir, cmd); - } + // BNC #594042: Multiple license locations + list <string> license_locations = ["/usr/share/doc/licenses/", "/"]; + + foreach (string license_location, license_locations, { + license_location = sformat ("%1/license.tar.gz", license_location); + + if (! FileUtils::Exists (license_location)) return; + + // Copy licenses so it can be used in firstboot later + // bnc #396976 + map cmd = (map) WFM::Execute (.local.bash_output, + sformat ( + "mkdir -p '%1' && cd '%1' && rm -rf license*.*; cd '%1' && tar -xf '%2'", + String::Quote (license_dir), + String::Quote (license_location) + ) + ); + if (cmd["exit"]:-1 == 0) { + y2milestone ("Copying %1 to %2 was successful", license_location, license_dir); + } else { + y2error ("Copying %1 to %2 has failed: %3", license_location, license_dir, cmd); + } + + break; + }); // bugzila #328126 // Copy 70-persistent-cd.rules ... if not updating -- 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] r61594 - in /trunk/scanner: package/yast2-scanner.changes src/Scanner.ycp tools/Makefile.am tools/test_and_set_scanner_access_permissions
by jsmeix＠svn.opensuse.org 06 Apr '10

06 Apr '10

Author: jsmeix Date: Tue Apr 6 17:56:00 2010 New Revision: 61594 URL: http://svn.opensuse.org/viewcvs/yast?rev=61594&view=rev Log: - V 2.19.2 - HAL is deprecated and does no longer support to grant read/write device access permissions for scanners to the currently logged in "desktop" user. Therefore the HAL related code was removed (see Novell/Suse Bugzilla bnc#593946). - Implemented Novell/Suse Bugzilla bnc#578203 enhancement to show in the model selection list "unmaintained driver" and added info to the help text so that the user knows in advance whether or not he could expect some help if there are issues with an unmaintained driver. - In case of the "net" meta-backend, the [Edit] button in the OverviewDialog now also launches the "Scanning via Network" dialog even when the "net" meta-backend did not recognize a scanner (see Novell/Suse Bugzilla bnc#578104). Removed: trunk/scanner/tools/test_and_set_scanner_access_permissions Modified: trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/tools/Makefile.am Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Tue Apr 6 17:56:00 2010 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Tue Apr 6 17:43:24 CEST 2010 - jsmeix(a)suse.de + +- V 2.19.2 +- HAL is deprecated and does no longer support to grant read/write + device access permissions for scanners to the currently logged + in "desktop" user. Therefore the HAL related code was removed + (see Novell/Suse Bugzilla bnc#593946). +- Implemented Novell/Suse Bugzilla bnc#578203 enhancement + to show in the model selection list "unmaintained driver" + and added info to the help text so that the user knows + in advance whether or not he could expect some help + if there are issues with an unmaintained driver. +- In case of the "net" meta-backend, the [Edit] button in the + OverviewDialog now also launches the "Scanning via Network" + dialog even when the "net" meta-backend did not recognize + a scanner (see Novell/Suse Bugzilla bnc#578104). + +------------------------------------------------------------------- Thu Jan 21 17:36:27 CET 2010 - jsmeix(a)suse.de - V 2.19.1 Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=6159… ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Tue Apr 6 17:56:00 2010 @@ -656,31 +656,6 @@ } /** - * Test and set scanner access permissions for USB scanners and SCSI scanners - * for resmgr via HAL by calling a bash script which does all the work. - * @return true on success - */ -boolean SetScannerAccessPermissions() -{ // Build the command line parameter: - string sane_devices = ""; - foreach( map< string, string > active_scanner, - active_scanners, - { sane_devices = sane_devices + active_scanner["sane_device"]:"unknown" + ";"; - } - ); - // Execute the command line: - if( ! ExecuteBashCommand( test_and_set_scanner_access_permissions_commandline - + " '" - + sane_devices - + "'" - ) - ) - { return false; - } - return true; -} - -/** * Test whether there exist a print queue which depends on the specified SANE backend. * Examples: * hpaio (package hplip): @@ -1853,37 +1828,6 @@ Instead use hpaio to set up the scanner. Alternatively proceed and change the printer configuration to use the ptal service. "); - string hal_does_not_know_scanner_message = - // Message of a Popup::Error when HAL does not know a scanner. - // Do not change or translate "udev", it is a subsystem name. - // Do not change or translate "HAL", it is a subsystem name. - // Do not change or translate "hal-resmgr", it is a service name. - // Do not change or translate "lshal", it is a command name. - // Do not change or translate "saned", it is a program (sane daemon) name. - // Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network) - // with "scanning the network" (i.e. scan the network for other hosts or services). - // Translate the entry "Scanning via Network" in the "Other" drop down menue - // and the button label "Local Host Configuration" so that it matches - // exactly to what is actually shown in your language in your dialogs. -_("A scanner is not known to HAL. -To access the scanner as normal user, -udev, HAL, and hal-resmgr are needed to grant -appropriate access permissions automatically. -Therefore the scanner model must be known to HAL. -If the scanner is not known to HAL, a re-plug -of a USB scanner should help. -Otherwise a reboot should be done to restart -the whole udev/HAL/hal-resmgr machinery. -Check if the scanner is listed in the lshal output. -If a SCSI scanner which was switched on during boot -is not listed in the lshal output, the usual reason -is that the kernel module for the scanner's SCSI host -adapter does not notify HAL about the scanner device. -If even a reboot does not help, you could access -the scanner via the saned as a workaround. -For this workaround choose 'Scanning via Network' -and select the 'Local Host Configuration'. -"); // Here the real code starts with proper indentation: if( backend_name == "" ) { if( database_index < 0 ) @@ -1906,7 +1850,7 @@ backend_name ), " ", - 6, + 5, [ // 1. progress stage name of a Progress::New: _("Check whether additional packages must be installed"), // 2. progress stage name of a Progress::New: @@ -1916,9 +1860,7 @@ // 4. progress stage name of a Progress::New: _("Activate the driver"), // 5. progress stage name of a Progress::New: - _("Determine active scanners"), - // 6. progress stage name of a Progress::New: - _("Test and set USB and SCSI scanner access permissions") + _("Determine active scanners") ], [ // 1. progress step progress bar title of a Progress::New: _("Checking whether additional packages must be installed..."), @@ -1930,8 +1872,6 @@ _("Activating the driver..."), // 5. progress step progress bar title of a Progress::New: _("Determining active scanners..."), - // 6. progress step progress bar title of a Progress::New: - _("Testing and setting USB and SCSI scanner access permissions..."), // Last progress step progress bar title of a Progress::New: _("Finished") ], @@ -2094,37 +2034,6 @@ Progress::NextStage(); if( ! DetermineActiveScanners() ) { active_scanners = []; - // This Progress::NextStage makes sure that - // the stage "Test and set USB and SCSI scanner access permissions" - // is shown to the user even if it is not actually executed. - // But because of the word "Test" it is not wrong to show it. - Progress::NextStage(); - } - else - { Progress::NextStage(); - if( ! SetScannerAccessPermissions() - && user_confirmation - ) - { if( 10 == result["exit"]:9999 ) - { // Special handling when the exit code is 10 which indicates - // that HAL does not know all active scanners. - Popup::ErrorDetails( hal_does_not_know_scanner_message, - // Only the stderr message shows exact information - // which scanners are unknown to HAL which is of interest - // when there is more than one scanner connected: - result["stderr"]:"" - ); - } - else - { // Whatever other error: - Popup::WarningDetails( // Message of a Popup::WarningDetails when setting scanner access permissions failed. - // Only a simple message because this error does not happen on a normal system - // (i.e. a system which is not totally broken or totally messed up). - _("Failed to set scanner access permissions.\n%1"), - result["stderr"]:"" - ); - } - } } if( ! DetermineActiveBackends() ) { active_backends = []; @@ -2280,9 +2189,6 @@ if( ! DetermineActiveScanners() ) { active_scanners = []; } - else - { SetScannerAccessPermissions(); - } if( ! DetermineActiveBackends() ) { active_backends = []; } @@ -2295,39 +2201,7 @@ * @return true on success */ global boolean TestBackend( string backend_name ) -{ // First of all the multi-line strings because such strings cannot be indented: - string hal_does_not_know_scanner_message = - // Message of a Popup::Error when HAL does not know a scanner. - // Do not change or translate "udev", it is a subsystem name. - // Do not change or translate "HAL", it is a subsystem name. - // Do not change or translate "hal-resmgr", it is a service name. - // Do not change or translate "lshal", it is a command name. - // Do not change or translate "saned", it is a program (sane daemon) name. - // Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network) - // with "scanning the network" (i.e. scan the network for other hosts or services). - // Translate the entry "Scanning via Network" in the "Other" drop down menue - // and the button label "Local Host Configuration" so that it matches - // exactly to what is actually shown in your language in your dialogs. -_("The scanner is not known to HAL. -To access the scanner as normal user, -udev, HAL, and hal-resmgr are needed to grant -appropriate access permissions automatically. -Therefore the scanner model must be known to HAL. -If the scanner is not known to HAL, a re-plug -of a USB scanner should help. -Otherwise a reboot should be done to restart -the whole udev/HAL/hal-resmgr machinery. -Check if the scanner is listed in the lshal output. -If a SCSI scanner which was switched on during boot -is not listed in the lshal output, the usual reason -is that the kernel module for the scanner's SCSI host -adapter does not notify HAL about the scanner device. -If even a reboot does not help, you could access -the scanner via the saned as a workaround. -For this workaround choose 'Scanning via Network' -and select the 'Local Host Configuration'. -"); - string sane_device = ""; +{ string sane_device = ""; // It is not possible to test a backend without a matching active scanner. // Build the table of active scanners of the backend (see ModelItems above): list< term > scanners_to_be_tested = []; @@ -2433,29 +2307,6 @@ result["stderr"]:_("(no results available)") ) ); - // Test if HAL knows the particular SANE device. - // This writes also /etc/hal/fdi/information/20thirdparty/80-scanner.fdi - // if the scanner is not listed in /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi - // (compare https://bugzilla.novell.com/show_bug.cgi?id=438867) - // which is perfectly o.k. because this could solve access permission issues - // automatically only by testing the device: - if( ! ExecuteBashCommand( test_and_set_scanner_access_permissions_commandline + " " + sane_device ) ) - { if( 10 == result["exit"]:9999 ) - { // Special handling when the exit code is 10 which indicates - // that HAL does not know the scanner. - // Show only the error message but return true nevertheless - // because the actual test via "scanimage" was successful. - Popup::ErrorDetails( hal_does_not_know_scanner_message, - sformat( // Popup::ErrorDetails details where - // %1 will be replaced by the SANE device identifier: - _("The following SANE device is not know to HAL: '%1'"), - sane_device - ) - ); - } - // Ignore any other errors of test_and_set_scanner_access_permissions - // e.g. when it fails because HAL stuff is not installed or whatever. - } return true; } Modified: trunk/scanner/tools/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/Makefile.am?rev=61… ============================================================================== --- trunk/scanner/tools/Makefile.am (original) +++ trunk/scanner/tools/Makefile.am Tue Apr 6 17:56:00 2010 @@ -11,8 +11,7 @@ setup_ptal_scanner_service \ setup_hplip_scanner_service \ determine_network_scanner_config \ - setup_network_scanner_config \ - test_and_set_scanner_access_permissions + setup_network_scanner_config EXTRA_DIST = $(ybin_SCRIPTS) -- 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] r61593 - /tags/branch-Code-11-SP1-2_17_73/packager/
by locilka＠svn.opensuse.org 06 Apr '10

06 Apr '10

Author: locilka Date: Tue Apr 6 17:49:23 2010 New Revision: 61593 URL: http://svn.opensuse.org/viewcvs/yast?rev=61593&view=rev Log: Created tag branch-Code-11-SP1-2_17_73 for packager Added: tags/branch-Code-11-SP1-2_17_73/packager/ (props changed) - copied from r61592, branches/SuSE-Code-11-SP1-Branch/packager/ -- 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] r61592 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 06 Apr '10

06 Apr '10

Author: locilka Date: Tue Apr 6 17:46:12 2010 New Revision: 61592 URL: http://svn.opensuse.org/viewcvs/yast?rev=61592&view=rev Log: - Searching for LiveCD license in /usr/share/doc/licenses and / directories (BNC #594042). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 6 17:46:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 6 17:44:25 CEST 2010 - locilka(a)suse.cz + +- Searching for LiveCD license in /usr/share/doc/licenses and / + directories (BNC #594042). + +------------------------------------------------------------------- Wed Mar 31 14:35:48 UTC 2010 - lslezak(a)suse.cz - put the Linuxrc CD/DVD device to the beginning of the CD/DVD Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Tue Apr 6 17:46:12 2010 @@ -513,25 +513,45 @@ void SearchForLicense_LiveCDInstallation (integer src_id, string fallback_dir) { y2milestone ("LiveCD License"); - if (FileUtils::Exists ("/license.tar.gz")) { - tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir)); - string license_file = "/license.tar.gz"; + // BNC #594042: Multiple license locations + list <string> license_locations = ["/usr/share/doc/licenses/", "/"]; - if (UnpackLicenseTgzFileToDirectory (license_file, tmpdir)) { - license_dir = tmpdir; - license_file_print = "license.tar.gz"; - } else { - CleanUpLicense (tmpdir); - license_file = nil; + license_dir = nil; + info_file = nil; + + foreach (string license_location, license_locations, { + license_location = sformat ("%1/license.tar.gz", license_location); + + if (FileUtils::Exists (license_location)) { + y2milestone ("Using license: %1", license_location); + tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir)); + + if (UnpackLicenseTgzFileToDirectory (license_location, tmpdir)) { + license_dir = tmpdir; + license_file_print = "license.tar.gz"; + } else { + CleanUpLicense (tmpdir); + } + break; } - } else { - license_dir = nil; + }); + + if (license_dir == nil) { + y2milestone ("No license found in: %1", license_locations); } - if (FileUtils::Exists ("/README.BETA")) { - info_file = "/README.BETA"; - } else { - info_file = nil; + foreach (string info_location, license_locations, { + info_location = sformat ("%1/README.BETA", info_location); + + if (FileUtils::Exists (info_location)) { + y2milestone ("Using info file: %1", info_location); + info_file = info_location; + break; + } + }); + + if (info_file == nil) { + y2milestone ("No info file found in: %1", license_locations); } } -- 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] r61591 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 06 Apr '10

06 Apr '10

Author: locilka Date: Tue Apr 6 17:45:56 2010 New Revision: 61591 URL: http://svn.opensuse.org/viewcvs/yast?rev=61591&view=rev Log: - Searching for LiveCD license in /usr/share/doc/licenses and / directories (BNC #594042). - 2.17.73 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Tue Apr 6 17:45:56 2010 @@ -1 +1 @@ -2.17.72 +2.17.73 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Tue Apr 6 17:45:56 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 6 17:44:25 CEST 2010 - locilka(a)suse.cz + +- Searching for LiveCD license in /usr/share/doc/licenses and / + directories (BNC #594042). +- 2.17.73 + +------------------------------------------------------------------- Wed Mar 31 14:35:48 UTC 2010 - lslezak(a)suse.cz - put the Linuxrc CD/DVD device to the beginning of the CD/DVD Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Tue Apr 6 17:45:56 2010 @@ -513,25 +513,45 @@ void SearchForLicense_LiveCDInstallation (integer src_id, string fallback_dir) { y2milestone ("LiveCD License"); - if (FileUtils::Exists ("/license.tar.gz")) { - tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir)); - string license_file = "/license.tar.gz"; + // BNC #594042: Multiple license locations + list <string> license_locations = ["/usr/share/doc/licenses/", "/"]; - if (UnpackLicenseTgzFileToDirectory (license_file, tmpdir)) { - license_dir = tmpdir; - license_file_print = "license.tar.gz"; - } else { - CleanUpLicense (tmpdir); - license_file = nil; + license_dir = nil; + info_file = nil; + + foreach (string license_location, license_locations, { + license_location = sformat ("%1/license.tar.gz", license_location); + + if (FileUtils::Exists (license_location)) { + y2milestone ("Using license: %1", license_location); + tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir)); + + if (UnpackLicenseTgzFileToDirectory (license_location, tmpdir)) { + license_dir = tmpdir; + license_file_print = "license.tar.gz"; + } else { + CleanUpLicense (tmpdir); + } + break; } - } else { - license_dir = nil; + }); + + if (license_dir == nil) { + y2milestone ("No license found in: %1", license_locations); } - if (FileUtils::Exists ("/README.BETA")) { - info_file = "/README.BETA"; - } else { - info_file = nil; + foreach (string info_location, license_locations, { + info_location = sformat ("%1/README.BETA", info_location); + + if (FileUtils::Exists (info_location)) { + y2milestone ("Using info file: %1", info_location); + info_file = info_location; + break; + } + }); + + if (info_file == nil) { + y2milestone ("No info file found in: %1", license_locations); } } -- 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] r61590 - in /trunk/storage: bindings/ycp/LibStorage.i package/yast2-storage.changes
by aschnell＠svn.opensuse.org 06 Apr '10

06 Apr '10

Author: aschnell Date: Tue Apr 6 12:25:35 2010 New Revision: 61590 URL: http://svn.opensuse.org/viewcvs/yast?rev=61590&view=rev Log: - workaround for build failure (bnc #593954) Modified: trunk/storage/bindings/ycp/LibStorage.i trunk/storage/package/yast2-storage.changes Modified: trunk/storage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/bindings/ycp/LibStorage.… ============================================================================== --- trunk/storage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/bindings/ycp/LibStorage.i Tue Apr 6 12:25:35 2010 @@ -7,6 +7,9 @@ %include "LiMaL.i" %{ +// workaround for bnc #593954 +#undef seed + #include <storage/StorageInterface.h> #include <storage/HumanString.h> #include <storage/Graph.h> 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 Tue Apr 6 12:25:35 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 06 12:20:10 CEST 2010 - aschnell(a)suse.de + +- workaround for build failure (bnc #593954) + +------------------------------------------------------------------- Mon Mar 29 16:08:36 CEST 2010 - aschnell(a)suse.de - enable XFS on S390 (bnc #591846) -- 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] r61589 - in /trunk/apparmor: package/yast2-apparmor.changes src/desktop/SD_genprof.desktop src/desktop/SD_logprof.desktop
by juhliarik＠svn.opensuse.org 06 Apr '10

06 Apr '10

Author: juhliarik Date: Tue Apr 6 11:08:25 2010 New Revision: 61589 URL: http://svn.opensuse.org/viewcvs/yast?rev=61589&view=rev Log: added fix for using AppArmor keyword in search filter bnc#590929 Modified: trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/desktop/SD_genprof.desktop trunk/apparmor/src/desktop/SD_logprof.desktop Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Tue Apr 6 11:08:25 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 6 11:04:52 CEST 2010 - juhliarik(a)suse.cz + +- updated "names" in .desktop files for searching AppArmor related + modules in YaST (bnc#590929) + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/apparmor/src/desktop/SD_genprof.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_genprof.… ============================================================================== --- trunk/apparmor/src/desktop/SD_genprof.desktop (original) +++ trunk/apparmor/src/desktop/SD_genprof.desktop Tue Apr 6 11:08:25 2010 @@ -20,5 +20,5 @@ Exec=xdg-su -c "/sbin/yast2 GenProf" Name=Add Profile Wizard -GenericName=Profile Wizard +GenericName=AppArmor Configuration StartupNotify=true Modified: trunk/apparmor/src/desktop/SD_logprof.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_logprof.… ============================================================================== --- trunk/apparmor/src/desktop/SD_logprof.desktop (original) +++ trunk/apparmor/src/desktop/SD_logprof.desktop Tue Apr 6 11:08:25 2010 @@ -20,5 +20,5 @@ Exec=xdg-su -c "/sbin/yast2 LogProf" Name=Update Profile Wizard -GenericName=Update Profiles +GenericName=AppArmor Configuration StartupNotify=true -- 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] r61588 - /tags/stable-2_21_32/gtk/
by rpmcruz＠svn.opensuse.org 02 Apr '10

02 Apr '10

Author: rpmcruz Date: Sat Apr 3 00:23:48 2010 New Revision: 61588 URL: http://svn.opensuse.org/viewcvs/yast?rev=61588&view=rev Log: Created tag stable-2_21_32 for gtk Added: tags/stable-2_21_32/gtk/ - copied from r61587, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0