Mailinglist Archive: yast-commit (1212 mails)

[lslezak@xxxxxxxxxxxxxxxx]

Author: lslezak
Date: Wed Sep 17 10:14:57 2008
New Revision: 51202

URL: http://svn.opensuse.org/viewcvs/yast?rev=51202&view=rev
Log:
- removed suse_register code which breaks add-on config in
  installation (bnc#408835) (reverted changes from rev.48402)

Modified:
    trunk/packager/package/yast2-packager.changes
    trunk/packager/src/include/repositories_include.ycp
    trunk/packager/src/modules/SourceDialogs.ycp

Modified: trunk/packager/package/yast2-packager.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=51202&r1=51201&r2=51202&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Wed Sep 17 10:14:57 2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Sep 17 09:57:14 CEST 2008 - lslezak@xxxxxxx
+
+- removed suse_register code which breaks add-on config in
+  installation (bnc#408835) (reverted changes from rev.48402)
+
+-------------------------------------------------------------------
 Fri Sep 12 14:56:19 CEST 2008 - lslezak@xxxxxxx
 
 - sw_single - handle 'Configuration->Online Update' menu item

Modified: trunk/packager/src/include/repositories_include.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositories_include.ycp?rev=51202&r1=51201&r2=51202&view=diff
==============================================================================
--- trunk/packager/src/include/repositories_include.ycp (original)
+++ trunk/packager/src/include/repositories_include.ycp Wed Sep 17 10:14:57 2008
@@ -21,7 +21,6 @@
     import "Label";
     import "SourceDialogs";
     import "Report";
-    import "Register";
 
     textdomain "packager";
 
@@ -309,15 +308,6 @@
 
        return `next;
     }
-    else if (url == "updates://")
-    {
-       y2milestone("Starting registration...");
-       Register::initialize();
-       y2milestone("Register::suseRegister: %1", 
Register::suseRegister(`autoyast));
-       Register::finish();
-
-       return `next;
-    }
 
     if (createSource(url, plaindir, download_meta, name) == `again)
        return `back;

Modified: trunk/packager/src/modules/SourceDialogs.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialogs.ycp?rev=51202&r1=51201&r2=51202&view=diff
==============================================================================
--- trunk/packager/src/modules/SourceDialogs.ycp (original)
+++ trunk/packager/src/modules/SourceDialogs.ycp Wed Sep 17 10:14:57 2008
@@ -1625,8 +1625,6 @@
            // radio button
            `Left (`RadioButton(`id(`slp),       _("&Scan Using SLP..."))),
            // radio button
-           `Left (`RadioButton(`id(`updates), _("Register &Update 
Repositories..."))),
-           // radio button
            `Left (`RadioButton(`id(`comm_repos), _("Commun&ity 
Repositories"))),
            `VSpacing(0.4),
            // radio button
@@ -1785,7 +1783,7 @@
 
     if (selected == nil)
        return nil;
-    if (selected == `slp || selected == `cd || selected == `dvd || selected == 
`comm_repos || selected == `updates)
+    if (selected == `slp || selected == `cd || selected == `dvd || selected == 
`comm_repos)
        return `finish;
 }
 
@@ -1797,7 +1795,7 @@
     symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton);
 
     if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, `usb, `hd,
-       `local_dir, `specify_url, `slp, `local_iso, `comm_repos, `updates], 
selected))
+       `local_dir, `specify_url, `slp, `local_iso, `comm_repos], selected))
     {
        if ( selected == `ftp ) _url = "ftp://";;
        else if ( selected == `http ) _url = "http://";;
@@ -1812,7 +1810,6 @@
        else if ( selected == `local_iso ) _url = "file://";
        else if ( selected == `slp ) _url = "slp://";
        else if ( selected == `comm_repos ) _url = "commrepos://";
-       else if ( selected == `updates ) _url = "updates://";
     }
     else
     {
@@ -1837,7 +1834,6 @@
     else if ( _url == "file://" ) current = `local_iso;
     else if ( _url == "slp://" ) current = `slp;
     else if ( _url == "commrepos://" ) current = `comm_repos;
-    else if ( _url == "updates://" ) current = `updates;
     else
     {
        y2warning ("Unknown URL scheme '%1'", _url);

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