Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r39919 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
  • From: locilka@xxxxxxxxxxxxxxxx
  • Date: Fri, 03 Aug 2007 08:35:11 -0000
  • Message-id: <20070803083511.D4A50B5940@xxxxxxxxxxxxxxxx>
Author: locilka
Date: Fri Aug  3 10:35:11 2007
New Revision: 39919

URL: http://svn.opensuse.org/viewcvs/yast?rev=39919&view=rev
Log:
- Using new pkg-bindings functionality to provide optional
  directory with licenses (#302018).
- New text for License dialog (FATE #302018 comment #36).


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=39919&r1=39918&r2=39919&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Fri Aug  3 10:35:11 2007
@@ -10,6 +10,9 @@
   first stage installation (instead of 'official').
 - Reporting when list of repositories is empty, cannot be
   downloaded or parsed (#294997).
+- Using new pkg-bindings functionality to provide optional
+  directory with licenses (#302018).
+- New text for License dialog (FATE #302018 comment #36).
 
 -------------------------------------------------------------------
 Thu Aug  2 11:08:37 CEST 2007 - lslezak@xxxxxxx

Modified: trunk/packager/src/modules/ProductLicense.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=39919&r1=39918&r2=39919&view=diff
==============================================================================
--- trunk/packager/src/modules/ProductLicense.ycp (original)
+++ trunk/packager/src/modules/ProductLicense.ycp Fri Aug  3 10:35:11 2007
@@ -158,8 +158,8 @@
            `Left (
                // TRANSLATORS: addition license information
                // FATE #302018
-               `Label (_("If you like to print this license,
-check the EULA.txt file on the first media."))
+               `Label (_("If you want to print this EULA, you can find it
+on the first media in the directory '/media.1/licenses/'"))
            ),
            `HSpacing (2*space)
        ),
@@ -263,9 +263,14 @@
        // FATE #302018
        // Licenses are unzipped under 1stMedia:/media.1/license/
        // Don't unzip, just use the directory
-       license_dir = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license/license.txt");
+       license_dir = Pkg::SourceProvideDirectory (
+           src_id, 1,
+           "/media.1/license/",
+           true, /* optional */
+           false /* no subdirs */
+       );
        if (license_dir != nil) {
-           license_dir = Pkg::SourceProvideDir (src_id, 1, "/media.1/license/");
+           y2milestone ("Using directory %1 for licenses", license_dir);
            // return from the function
            return;
        }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages