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.changes?rev=61592&r1=61591&r2=61592&view=diff ============================================================================== --- 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@suse.cz + +- Searching for LiveCD license in /usr/share/doc/licenses and / + directories (BNC #594042). + +------------------------------------------------------------------- Wed Mar 31 14:35:48 UTC 2010 - lslezak@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/ProductLicense.ycp?rev=61592&r1=61591&r2=61592&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org