[yast-commit] r53677 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/online_update_configuration.ycp src/modules/OnlineUpdateConfiguration.ycp

27 Nov 2008

Author: jdsn
Date: Thu Nov 27 22:47:23 2008
New Revision: 53677

URL: http://svn.opensuse.org/viewcvs/yast?rev=53677&view=rev
Log:
fix restoring the default update repository (bnc#444301)
2.17.16

Modified:
    trunk/registration/VERSION
    trunk/registration/package/yast2-registration.changes
    trunk/registration/src/clients/online_update_configuration.ycp
    trunk/registration/src/modules/OnlineUpdateConfiguration.ycp

Modified: trunk/registration/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=53677&r1=53676&r2=53677&view=diff
==============================================================================

--- trunk/registration/VERSION (original)
+++ trunk/registration/VERSION Thu Nov 27 22:47:23 2008
@@ -1 +1 @@
-2.17.15
+2.17.16

Modified: trunk/registration/package/yast2-registration.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=53677&r1=53676&r2=53677&view=diff
==============================================================================
--- trunk/registration/package/yast2-registration.changes (original)
+++ trunk/registration/package/yast2-registration.changes Thu Nov 27 22:47:23 2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Nov 27 21:08:07 CET 2008 - jdsn@suse.de
+
+- fix restoring the default update repository (bnc#444301)
+- 2.17.16 
+
+-------------------------------------------------------------------
 Mon Nov 24 12:27:12 CET 2008 - jdsn@suse.de
 
 - call other modules via WFM (bnc#447043)

Modified: trunk/registration/src/clients/online_update_configuration.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/online_update_configuration.ycp?rev=53677&r1=53676&r2=53677&view=diff
==============================================================================
--- trunk/registration/src/clients/online_update_configuration.ycp (original)
+++ trunk/registration/src/clients/online_update_configuration.ycp Thu Nov 27 22:47:23 2008
@@ -49,6 +49,8 @@
 
 /* ---------------------------------------------------------------------------------------------------------------  */
 
+    Pkg::SourceStartManager(true);
+
     // check if we are in installation workflow or running independently
     if (Mode::normal()) Wizard::CreateDialog();
 
@@ -68,8 +70,9 @@
 
     string replaceUpdateRepoString = OnlineUpdateConfiguration::currentUpdateRepo;
 
-    if ( OnlineUpdateConfiguration::currentUpdateRepo == OnlineUpdateConfiguration::defaultUpdateRepo  &&
-         OnlineUpdateConfiguration::currentUpdateRepo != ""                                                )
+
+    if ( OnlineUpdateConfiguration::compareUpdateURLs( OnlineUpdateConfiguration::currentUpdateRepo, 
+                                                       OnlineUpdateConfiguration::defaultUpdateRepo, false ) )
     {// in this case - we have default update repo installed
         replaceUpdateRepoString = OnlineUpdateConfiguration::currentUpdateRepo + "   " + defaultMark;
         UI::ChangeWidget(`id(`restoreDefault), `Enabled, false);
@@ -77,7 +80,9 @@
     else
     { // in this case - custom or no update repo
         if ( replaceUpdateRepoString == ""  ) replaceUpdateRepoString = noRepo;
-        UI::ChangeWidget(`id(`restoreDefault), `Enabled, true);
+
+        boolean hasUpRepo = (OnlineUpdateConfiguration::defaultUpdateRepo != "" && OnlineUpdateConfiguration::defaultUpdateRepo != nil );
+        UI::ChangeWidget(`id(`restoreDefault), `Enabled, hasUpRepo);
     }
 
     // write data to the UI
@@ -165,14 +170,25 @@
         {
             y2milestone("Refetching current updateRepoURL.");
             replaceUpdateRepoString = OnlineUpdateConfiguration::fetchCurrentUpdateRepoURL();
+
+            string mark = "";
+            if ( OnlineUpdateConfiguration::compareUpdateURLs( replaceUpdateRepoString,
+                                                               OnlineUpdateConfiguration::defaultUpdateRepo, false) )
+            {
+                mark = "   " + defaultMark;
+                UI::ChangeWidget(`id(`restoreDefault), `Enabled, false);
+            }
             y2milestone("Current updateRepoURL is: %1", replaceUpdateRepoString);
-            UI::ChangeWidget(`id(`currentRepoURL), `Value,  replaceUpdateRepoString);
+            UI::ChangeWidget(`id(`currentRepoURL), `Value,  replaceUpdateRepoString + mark);
+
             UI::RecalcLayout();
         }
 
 
     } until (ret == `next || ret == `abort || ret == `cacel || ret == `back);
 
+    Pkg::SourceFinishAll();
+
     if (! is(ret, symbol))  ret = `next;
 
     Wizard::CloseDialog();

Modified: trunk/registration/src/modules/OnlineUpdateConfiguration.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/OnlineUpdateConfiguration.ycp?rev=53677&r1=53676&r2=53677&view=diff
==============================================================================
--- trunk/registration/src/modules/OnlineUpdateConfiguration.ycp (original)
+++ trunk/registration/src/modules/OnlineUpdateConfiguration.ycp Thu Nov 27 22:47:23 2008
@@ -55,14 +55,25 @@
 
     // fetch product details about installed products
     list > productDetail = (list >) Pkg::ResolvableProperties( "", `product, "" );
-    map baseProductDetail = $[];
+    baseProductDetail = $[];
+
+//FIXME START
+//FIXME: 1) pkg-bindings return only addon products for openSUSE (bnc#449844)
+//FIXME: 2) the product definition does not contain update URLS (bnc#449842)
+//FIXME: If either of these remain unfixed the following two lines need to be uncommented,
+//FIXME: otherwise restoring of the default update repo is only possible via NCC registration
+/*
+productDetail[0, "category"]="base";
+productDetail[0, "update_urls"] = ["http://download.opensuse.org/update/11.1/"];
+*/
+//FIXME END
 
     y2debug("All installed products are: %1", productDetail);
     y2debug("Now looking for the base product");
 
     // filter the map to find the one any only base product
     productDetail = filter( map oneProduct, productDetail, {
-        return  oneProduct["category"]:"unknown" == "base";
+        return oneProduct["category"]:"unknown" == "base";
     });
 
     y2debug("All installed base products are: %1", productDetail);
@@ -86,6 +97,38 @@
     return true;
 }
 
+/*
+ * compareUpdateURLs
+ * compare two URLs - only the scheme, hostname and path will be compared, a trailing slash will be ignored
+ * @return true if urls match
+ */
+global boolean compareUpdateURLs(string url1, string url2, boolean allowEmpty)
+{
+    y2debug("Comparing two urls.");
+    if ( url1 == "" &&  url2 == "" && ! allowEmpty )
+    {
+        return false;
+    }
+
+    map url1map = URL::Parse(url1);
+    map url2map = URL::Parse(url2);
+
+    // removing trailing slash
+    if ( regexpmatch( url1map["path"]:"", "/$" ) )
+        url1map["path"]   = regexpsub(url1map["path"]:"", "(.*)/$", "\\1");
+    if ( regexpmatch( url2map["path"]:"", "/$" ) )
+        url2map["path"]   = regexpsub(url2map["path"]:"", "(.*)/$", "\\1");
+
+    if ( tolower(url1map["scheme"]:"X") ==  tolower(url2map["scheme"]:"Y") &&
+         tolower(url1map["host"]:"X")   ==  tolower(url2map["host"]:"Y")   &&
+         url1map["path"]:"X"   ==  url2map["path"]:"Y"                         )
+    {
+        return true;
+    }
+
+    return false;
+}
+
 
 /*
  * fetchBaseProductURLs
@@ -98,7 +141,6 @@
     string defUp = "";
     string defReg = "";
 
-    // FIXME - fetch the repo from the package bindings
     if ( defaultUpdateRepo == nil ||
          defaultUpdateRepo == ""     )
     {
@@ -240,11 +282,6 @@
     }
     else
     {
-        map allUpdateReposMap = $[];
-        allUpdateReposMap = listmap(string oneRepo, allUpdateRepos, {
-            return $[ oneRepo : URL::Parse(oneRepo) ];
-        });
-
         list<integer> allCurrentRepos = Pkg::SourceGetCurrent(true);
         if ( size(allCurrentRepos) < 1 )
         {
@@ -257,13 +294,9 @@
 
             foreach(integer repoID, allCurrentRepos, {
                 string repoURL = Pkg::SourceURL(repoID);
-                map repoURLmap = URL::Parse(repoURL);
 
-                foreach(string upRepo, map upRepoMap, allUpdateReposMap, {
-                    if ( repoURLmap["scheme"]:"X" ==  upRepoMap["scheme"]:"Y" &&
-                         repoURLmap["host"]:"X"   ==  upRepoMap["host"]:"Y" &&
-                         repoURLmap["path"]:"X"   ==  upRepoMap["path"]:"Y"
-                       )
+                foreach(string upRepo, allUpdateRepos, {
+                    if ( compareUpdateURLs(repoURL, upRepo, false) )
                     {
                         foundUpdateRepo = add( foundUpdateRepo, repoURL );
                     }
@@ -308,11 +341,21 @@
                                      "name"          : "Default-Update-Repository",
                                      "alias"         : "Default-Update-Repository",
                                      "base_urls"     : [ updateRepo ],
-                                     "priority"      : 10
+                                     "priority"      : 20
                                  ];
 
     y2milestone("Adding new update repository.");
     integer newSrcID = Pkg::RepositoryAdd( newSrcMap );
+    if (newSrcID != nil)
+    {
+        y2milestone("Successfully added the default update repository to the system.");
+        currentUpdateRepo = updateRepo;
+    }
+    else
+    {
+        y2error("Could not add the default update repository to the system.");
+    }
+
     y2milestone("Saving all source changes to the system.");
     Pkg::SourceSaveAll();
 
@@ -391,6 +434,8 @@
     else
         y2error("Could not fetch base product details information.");
 
+    // read base URLs from the base product
+    fetchBaseProductURLs();
     // this will update the default update repo as well - so do it once here
     string foo = fetchCurrentUpdateRepoURL();
 

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r53677 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/online_update_configuration.ycp src/modules/OnlineUpdateConfiguration.ycp

jdsn＠svn.opensuse.org