Mailinglist Archive: yast-commit (190 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Tue May 22 10:56:08 2007
New Revision: 38074

URL: http://svn.opensuse.org/viewcvs/yast?rev=38074&view=rev
Log:
- enable rpm directory with .rpm extension (#276861)
- 2.15.9 


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

Modified: trunk/add-on-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38074&r1=38073&r2=38074&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Tue May 22 10:56:08 2007
@@ -1 +1 @@
-2.15.8
+2.15.9

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=38074&r1=38073&r2=38074&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue May 22 10:56:08 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue May 22 10:42:36 CEST 2007 - jsuchome@xxxxxxx
+
+- enable rpm directory with .rpm extension (#276861)
+- 2.15.9 
+
+-------------------------------------------------------------------
 Mon May 21 13:21:12 CEST 2007 - jsuchome@xxxxxxx
 
 - fixed signing content file (#275883)

Modified: trunk/add-on-creator/src/add-on-creator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator.ycp?rev=38074&r1=38073&r2=38074&view=diff
==============================================================================
--- trunk/add-on-creator/src/add-on-creator.ycp (original)
+++ trunk/add-on-creator/src/add-on-creator.ycp Tue May 22 10:56:08 2007
@@ -272,13 +272,16 @@
 boolean CreateAddOn (map<string,any> options) {
 
     AddOnCreator::clone        = false;
-    AddOnCreator::rpm_path     = options["rpm_dir"]:"";
-    if (AddOnCreator::rpm_path == "")
+    string rpm_dir     = options["rpm_dir"]:"";
+    if (rpm_dir == "")
     {
        // error message
        Report::Error (_("Path to directory with packages is missing."));
        return false;
     }
+    if (substring (rpm_dir, size (rpm_dir) - 1, 1) != "/")
+       rpm_dir = rpm_dir + "/";
+    AddOnCreator::rpm_path     = rpm_dir;
     if (!haskey (options, "content"))
     {
        // error message

Modified: trunk/add-on-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=38074&r1=38073&r2=38074&view=diff
==============================================================================
--- trunk/add-on-creator/src/complex.ycp (original)
+++ trunk/add-on-creator/src/complex.ycp Tue May 22 10:56:08 2007
@@ -330,7 +330,11 @@
                UI::SetFocus (`id(`required_rpm_path));
                continue;
            }
+           if (substring (dir, size (dir) - 1, 1) != "/")
+               dir     =       dir + "/";
            AddOnCreator::rpm_path              = dir;
+           if (req_dir != "" && substring (req_dir, size (req_dir) - 1, 1) != "/")
+               req_dir =       req_dir + "/";
            AddOnCreator::required_rpm_path     = req_dir;
            if (requires == "")
                requires = (string) UI::QueryWidget (`id(`other_val), `Value);

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