Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r40053 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Tue, 07 Aug 2007 10:40:32 -0000
  • Message-id: <20070807104032.54ED8CDF3E@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Tue Aug  7 12:40:31 2007
New Revision: 40053

URL: http://svn.opensuse.org/viewcvs/yast?rev=40053&view=rev
Log:
- licenses of packages merged into EULA.txt (F302018)
- 2.15.18


Modified:
    trunk/add-on-creator/VERSION
    trunk/add-on-creator/package/yast2-add-on-creator.changes
    trunk/add-on-creator/src/AddOnCreator.ycp

Modified: trunk/add-on-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=40053&r1=40052&r2=40053&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Tue Aug  7 12:40:31 2007
@@ -1 +1 @@
-2.15.17
+2.15.18

Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=40053&r1=40052&r2=40053&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue Aug  7 12:40:31 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Aug  7 11:22:00 CEST 2007 - jsuchome@xxxxxxx
+
+- licenses of packages merged into EULA.txt (F302018)
+- 2.15.18
+
+-------------------------------------------------------------------
 Mon Aug  6 14:07:47 CEST 2007 - jsuchome@xxxxxxx
 
 - enable entering product name and version before content file

Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=40053&r1=40052&r2=40053&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Tue Aug  7 12:40:31 2007
@@ -1409,11 +1409,11 @@
 
     boolean ret        = true;
     string cmd = "";
-    if (size (files) > 0)
-       SCR::Execute (.target.mkdir, media_path +"/license");
     foreach (string file, string cont, files, {
        if (cont != "")
        {
+           if (!FileUtils::Exists (media_path +"/license"))
+               SCR::Execute (.target.mkdir, media_path +"/license");
            integer pos = findlastof (file, ".");
            if (pos == nil || substring (file, pos) != ".txt")
                file    = file + ".txt";
@@ -1421,9 +1421,21 @@
            ret = ret &&
                SCR::Write (.target.string, media_path +"/license/"+ file,cont);
            if (file == "license.txt")
-               SCR::Write (.target.string, base_output_path+"/EULA.txt", cont);
+               SCR::Write (.target.string, tmpdir + "/EULA.txt", cont);
        }
     });
+    if (!FileUtils::Exists (tmpdir + "/EULA.txt"))
+       SCR::Execute (.target.bash, sformat ("touch %1/EULA.txt", tmpdir));
+    if (FileUtils::Exists ("/usr/bin/packages2eula.pl"))
+    {
+       SCR::Execute (.target.bash_output, sformat(
+       "/usr/bin/packages2eula.pl -p %1/packages.en -o %2/EULA.txt 2>/dev/null"
+       , full_descr_path, tmpdir));
+    }
+    if (FileUtils::GetSize (tmpdir + "/EULA.txt") > 0)
+       SCR::Execute (.target.bash, sformat ("cp %1/EULA.txt %2/", tmpdir,
+           base_output_path));
+
     return ret;
 }
 
@@ -1927,8 +1939,6 @@
 
        WriteMediaFiles (base_output_path, media_files, nextmedia);
 
-       WriteLicensesFiles (full_media_paths[0]:"", license_files);
-
        if (info != "")
            SCR::Write (.target.string, full_media_paths[0]:"" + "/info.txt", info);
 
@@ -1942,6 +1952,8 @@
 
        WritePackageDescriptions (full_descr_path, packages_descr);
 
+       WriteLicensesFiles (full_media_paths[0]:"", license_files);
+
        WriteWorkflow (base_output_path, workflow_path, y2update_packages, y2update_path);
 
        Progress::NextStage();

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

< Previous Next >
This Thread
  • No further messages