Mailinglist Archive: yast-commit (1008 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Fri Feb  1 13:11:46 2008
New Revision: 44097

URL: http://svn.opensuse.org/viewcvs/yast?rev=44097&view=rev
Log:
- Using new URL functions in AddOnProduct.


Modified:
    trunk/packager/package/yast2-packager.changes
    trunk/packager/src/modules/AddOnProduct.ycp
    trunk/packager/yast2-packager.spec.in

Modified: trunk/packager/package/yast2-packager.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=44097&r1=44096&r2=44097&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Fri Feb  1 13:11:46 2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Feb  1 13:10:37 CET 2008 - locilka@xxxxxxx
+
+- Using new URL functions in AddOnProduct.
+- Adjusted RPM dependencies.
+
+-------------------------------------------------------------------
 Thu Jan 31 11:17:06 CET 2008 - locilka@xxxxxxx
 
 - Reworked ProductLicense module to handle first-stage installation

Modified: trunk/packager/src/modules/AddOnProduct.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduct.ycp?rev=44097&r1=44096&r2=44097&view=diff
==============================================================================
--- trunk/packager/src/modules/AddOnProduct.ycp (original)
+++ trunk/packager/src/modules/AddOnProduct.ycp Fri Feb  1 13:11:46 2008
@@ -36,6 +36,7 @@
 import "Directory";
 import "String";
 import "WorkflowManager";
+import "URL";
 
 // variables for installation with product
 /**
@@ -110,47 +111,6 @@
 }
 
 /**
- * Reads list of HTTP params and returns them as map
- *
- * @params string params
- * @return map <string, string> params
- *
- * @example
- *     MakeMapFromParams ("device=sda3&login=aaa&password=bbb") -> $[
- *             "device"   : "sda3",
- *             "login"    : "aaa",
- *             "password" : "bbb"
- *     ]
- */
-map <string, string> MakeMapFromParams (string params) {
-    list <string> params_list = splitstring (params, "&");
-
-    params_list = filter (string one_param, params_list, {
-       return (one_param != "" && one_param != nil);
-    });
-
-    map <string, string> ret = $[];
-    integer eq_pos = nil;
-    string opt = "";
-    string val = "";
-
-    foreach (string one_param, params_list, {
-       eq_pos = search (one_param, "=");
-
-       if (eq_pos == nil) {
-           ret[one_param] = "";
-       } else {
-           opt = substring (one_param, 0, eq_pos);
-           val = substring (one_param, (eq_pos + 1));
-
-           ret[opt] = val;
-       }
-    });
-
-    return ret;
-}
-
-/**
  * Returns an absolute URL from base + relative url.
  * Relative URL needs to start with 'reulrl://' othewise
  * it is not considered being relative and it's returned
@@ -236,27 +196,14 @@
        url = regexpsub (url, "^(.*)/\\./(.*)", "\\1/\\2");
     }
 
-    map <string, string> base_params_map  = MakeMapFromParams (base_params);
-    map <string, string> added_params_map = MakeMapFromParams (added_params);
+    map <string, string> base_params_map  = URL::MakeMapFromParams 
(base_params);
+    map <string, string> added_params_map = URL::MakeMapFromParams 
(added_params);
     map <string, string> final_params_map = (map <string, string>) union 
(base_params_map, added_params_map);
 
     if (size (final_params_map) > 0) {
        y2milestone ("%1 merge %2 -> %3", base_params_map, added_params_map, 
final_params_map);
 
-       string url_add = "";
-
-       foreach (string opt, string val, final_params_map, {
-           url_add =
-               url_add +
-               // add '&' if needed
-               (size (url_add) > 0 ? "&" : "") +
-               opt +
-               // define 'opt=val' if val is set
-               // otherwise don't use '=val' at all
-               (size (val) > 0 ? "=" + val : "");
-       });
-
-       url = url + "?" + url_add;
+       url = url + "?" + URL::MakeParamsFromMap (final_params_map);
     }
 
     y2milestone ("Final URL: '%1'", url);

Modified: trunk/packager/yast2-packager.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=44097&r1=44096&r2=44097&view=diff
==============================================================================
--- trunk/packager/yast2-packager.spec.in (original)
+++ trunk/packager/yast2-packager.spec.in Fri Feb  1 13:11:46 2008
@@ -4,8 +4,9 @@
 @HEADER@
 BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml 
perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp
 
-# Progress::Subprogress*()
-BuildRequires: yast2 >= 2.16.17
+# URL::MakeParamsFromMap and URL::MakeMapFromParams
+BuildRequires: yast2 >= 2.16.25
+
 # changed signatures of GPG calbacks
 BuildRequires: yast2-pkg-bindings >= 2.16.11
 
@@ -19,8 +20,8 @@
 # New functions: GPG key management
 Requires:      yast2-pkg-bindings >= 2.16.10
 
-# recursive Progress::New()
-Requires:      yast2 >= 2.16.22
+# URL::MakeParamsFromMap and URL::MakeMapFromParams
+Requires:      yast2 >= 2.16.25
 
 # unzipping license file
 Requires:      unzip

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