April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56586 - in /trunk/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: ug Date: Thu Apr 2 15:57:52 2009 New Revision: 56586 URL: http://svn.opensuse.org/viewcvs/yast?rev=56586&view=rev Log: 2.18.2 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=565… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Thu Apr 2 15:57:52 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Apr 2 15:57:52 2009 @@ -2,6 +2,7 @@ Wed Apr 1 16:11:08 CEST 2009 - ug(a)suse.de - storage lib compatibility with "used_by" +- 2.18.2 ------------------------------------------------------------------- Tue Mar 31 15:38:16 CEST 2009 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56585 - in /trunk/bootloader/src/ppc: helps.ycp ppc_options.ycp
by juhliarik＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: juhliarik Date: Thu Apr 2 15:06:57 2009 New Revision: 56585 URL: http://svn.opensuse.org/viewcvs/yast?rev=56585&view=rev Log: updated help text and UI Modified: trunk/bootloader/src/ppc/helps.ycp trunk/bootloader/src/ppc/ppc_options.ycp Modified: trunk/bootloader/src/ppc/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/ppc/helps.ycp?rev… ============================================================================== --- trunk/bootloader/src/ppc/helps.ycp (original) +++ trunk/bootloader/src/ppc/helps.ycp Thu Apr 2 15:06:57 2009 @@ -65,6 +65,23 @@ The OpenFirmware driver in the nVidia graphics card as shipped with Apple G5 systems will crash if there is no monitor attached."), + "macos_timeout" : + _("Timeout in Seconds for MacOS/Linux +It contains the timeout between MacOS/Linux in seconds until Linux boots automatically +if no key is pressed to boot MacOS"), + + "force_fat" : + _("Always Boot from FAT Partition +Normally the lilo script would automagically select the boot partition format +to either be a PReP boot partition or a FAT formatted file system for more +complex setups. This option forces the lilo script to use +the FAT formatted file system"), + + "force" : + _("Install Boot Loader Even on Errors +Install the bootloader even if it is unsure whether your firmware is +buggy so that next boot will fail. This results in an unsupported setup."), + ]; Modified: trunk/bootloader/src/ppc/ppc_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/ppc/ppc_options.y… ============================================================================== --- trunk/bootloader/src/ppc/ppc_options.ycp (original) +++ trunk/bootloader/src/ppc/ppc_options.ycp Thu Apr 2 15:06:57 2009 @@ -59,35 +59,15 @@ { UI::ChangeWidget (`id ("boot_pmac_custom"), `Items, devices); } + UI::ChangeWidget (`id ("boot_pmac_custom"), `Value, BootCommon::globals["boot_pmac_custom"]:""); - if (BootCommon::globals["boot_pmac_custom"]:"" == "") - { - UI::ChangeWidget (`id ("enable_pmac"), `Value, false); - UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, false); - } else { - UI::ChangeWidget (`id ("enable_pmac"), `Value, true); - UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, true); - UI::ChangeWidget (`id ("boot_pmac_custom"), `Value, BootCommon::globals["boot_pmac_custom"]:""); - } } void StoreBootPMAC (string widget, map event) { - if ((boolean) UI::QueryWidget(`id("enable_pmac"), `Value)) - { - BootCommon::globals["boot_pmac_custom"] - = (splitstring( (string)UI::QueryWidget (`id ("boot_pmac_custom"), `Value), " "))[0]:""; - } else { - BootCommon::globals["boot_pmac_custom"] = ""; - } -} + BootCommon::globals["boot_pmac_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_pmac_custom"), `Value), " "))[0]:""; -symbol HandleBootPMAC (string key, map event) { - any ret = event["ID"]:nil; - if (ret == "enable_pmac") { - UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, - (boolean) UI::QueryWidget(`id("enable_pmac"), `Value)); - } } map<string,any> BootPMAC(){ @@ -96,13 +76,11 @@ "custom_widget" : `VBox( `Frame ( _("Boot Loader Location"), `VBox( `Left(`HBox(`HSpacing(1),`VBox( - `Left(`CheckBox(`id("enable_pmac"), `opt(`notify), _("HFS Boot &Partition"))), - `Left(`ComboBox(`id("boot_pmac_custom"), `opt(`editable, `hstretch), "", [""])) + `Left(`ComboBox(`id("boot_pmac_custom"), `opt(`editable, `hstretch), _("HFS Boot &Partition"), [""])) ))) ))), "help" : ppc_help_messages["boot_pmac_custom"]:"", "init" : InitBootPMAC, - "handle" : HandleBootPMAC, "store" : StoreBootPMAC, ]; } @@ -115,49 +93,29 @@ UI::ChangeWidget (`id ("boot_chrp_custom"), `Items, devices); } - if (BootCommon::globals["boot_chrp_custom"]:"" == "") - { - UI::ChangeWidget (`id ("enable_chrp"), `Value, false); - UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, false); - } else { - UI::ChangeWidget (`id ("enable_chrp"), `Value, true); - UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, true); - UI::ChangeWidget (`id ("boot_chrp_custom"), `Value, BootCommon::globals["boot_chrp_custom"]:""); - } + UI::ChangeWidget (`id ("boot_chrp_custom"), `Value, BootCommon::globals["boot_chrp_custom"]:""); + } void StoreBootCHRP (string widget, map event) { - if ((boolean) UI::QueryWidget(`id("enable_chrp"), `Value)) - { - BootCommon::globals["boot_chrp_custom"] - = (splitstring( (string)UI::QueryWidget (`id ("boot_chrp_custom"), `Value), " "))[0]:""; - } else { - BootCommon::globals["boot_chrp_custom"] = ""; - } -} + BootCommon::globals["boot_chrp_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_chrp_custom"), `Value), " "))[0]:""; -symbol HandleBootCHRP (string key, map event) { - any ret = event["ID"]:nil; - if (ret == "enable_chrp") { - UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, - (boolean) UI::QueryWidget(`id("enable_chrp"), `Value)); - } } + map<string,any> BootCHRP(){ return $[ "widget" : `custom, "custom_widget" : `VBox( `Frame ( _("Boot Loader Location"), `VBox( `Left(`HBox(`HSpacing(1),`VBox( - `Left(`CheckBox(`id("enable_chrp"), `opt(`notify), _("&PReP or FAT Partition"))), - `Left(`ComboBox(`id("boot_chrp_custom"), `opt(`editable, `hstretch), "", [""])) + `Left(`ComboBox(`id("boot_chrp_custom"), `opt(`editable, `hstretch), _("&PReP or FAT Partition"), [""])) ))) ))), "help" : ppc_help_messages["boot_chrp_custom"]:"", "init" : InitBootCHRP, - "handle" : HandleBootCHRP, "store" : StoreBootCHRP, ]; } @@ -170,49 +128,28 @@ UI::ChangeWidget (`id ("boot_prep_custom"), `Items, devices); } - if (BootCommon::globals["boot_prep_custom"]:"" == "") - { - UI::ChangeWidget (`id ("enable_prep"), `Value, false); - UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, false); - } else { - UI::ChangeWidget (`id ("enable_prep"), `Value, true); - UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, true); - UI::ChangeWidget (`id ("boot_prep_custom"), `Value, BootCommon::globals["boot_prep_custom"]:""); - } + UI::ChangeWidget (`id ("boot_prep_custom"), `Value, BootCommon::globals["boot_prep_custom"]:""); } void StoreBootPReP (string widget, map event) { - if ((boolean) UI::QueryWidget(`id("enable_prep"), `Value)) - { - BootCommon::globals["boot_prep_custom"] - = (splitstring( (string)UI::QueryWidget (`id ("boot_prep_custom"), `Value), " "))[0]:""; - } else { - BootCommon::globals["boot_prep_custom"] = ""; - } -} + BootCommon::globals["boot_prep_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_prep_custom"), `Value), " "))[0]:""; -symbol HandleBootPReP (string key, map event) { - any ret = event["ID"]:nil; - if (ret == "enable_prep") { - UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, - (boolean) UI::QueryWidget(`id("enable_prep"), `Value)); - } } + map<string,any> BootPReP(){ return $[ "widget" : `custom, "custom_widget" : `VBox( `Frame ( _("Boot Loader Location"), `VBox( `Left(`HBox(`HSpacing(1),`VBox( - `Left(`CheckBox(`id("enable_prep"), `opt(`notify), _("&PReP partitions"))), - `Left(`ComboBox(`id("boot_prep_custom"), `opt(`editable, `hstretch), "", [""])) + `Left(`ComboBox(`id("boot_prep_custom"), `opt(`editable, `hstretch), _("&PReP partitions"), [""])) ))) ))), "help" : ppc_help_messages["boot_prep_custom"]:"", "init" : InitBootPReP, - "handle" : HandleBootPReP, "store" : StoreBootPReP, ]; } @@ -338,8 +275,8 @@ // end PREP // PMAC - "no_os_chooser" : CommonCheckboxWidget(_("Do not Use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), - "macos_timeout" : CommonIntFieldWidget (_("Timeout in Seconds for MacOS/Linux"), + "no_os_chooser" : CommonCheckboxWidget(_("&Do not Use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), + "macos_timeout" : CommonIntFieldWidget (_("&Timeout in Seconds for MacOS/Linux"), ppc_help_messages["macos_timeout"]:"",0,60), // end PMAC -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56584 - /tags/stable-0_8_9/metapackage/
by lslezak＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: lslezak Date: Thu Apr 2 15:06:41 2009 New Revision: 56584 URL: http://svn.opensuse.org/viewcvs/yast?rev=56584&view=rev Log: Created tag stable-0_8_9 for metapackage Added: tags/stable-0_8_9/metapackage/ - copied from r56583, trunk/metapackage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56583 - /tags/stable-0_8_9/
by lslezak＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: lslezak Date: Thu Apr 2 15:06:40 2009 New Revision: 56583 URL: http://svn.opensuse.org/viewcvs/yast?rev=56583&view=rev Log: Created tag stable-0_8_9 Added: tags/stable-0_8_9/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56582 - in /trunk/metapackage: VERSION package/yast2-metapackage-handler.changes src/OneClickInstallWorker.ycp src/OneClickInstallWorkerFunctions.ycp
by lslezak＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: lslezak Date: Thu Apr 2 15:06:07 2009 New Revision: 56582 URL: http://svn.opensuse.org/viewcvs/yast?rev=56582&view=rev Log: - properly initialize package slideshow, display correct installation progress (bnc#482320) - 0.8.9 Modified: trunk/metapackage/VERSION trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstallWorker.ycp trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Modified: trunk/metapackage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/VERSION?rev=56582&r1… ============================================================================== --- trunk/metapackage/VERSION (original) +++ trunk/metapackage/VERSION Thu Apr 2 15:06:07 2009 @@ -1 +1 @@ -0.8.8 +0.8.9 Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Thu Apr 2 15:06:07 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 2 13:57:51 CEST 2009 - lslezak(a)suse.cz + +- properly initialize package slideshow, display correct + installation progress (bnc#482320) +- 0.8.9 + +------------------------------------------------------------------- Thu Feb 12 12:31:43 CET 2009 - coolo(a)suse.de - make the desktop files more XDG compliant Modified: trunk/metapackage/src/OneClickInstallWorker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallW… ============================================================================== --- trunk/metapackage/src/OneClickInstallWorker.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorker.ycp Thu Apr 2 15:06:07 2009 @@ -57,7 +57,6 @@ if (success) { SlideShow::SetLanguage (UI::GetLanguage(true)); - PackageSlideShow::InitPkgData(true); SlideShow::Setup( [$[ Modified: trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallW… ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Thu Apr 2 15:06:07 2009 @@ -15,6 +15,8 @@ import "PackageCallbacks"; import "SourceManager"; import "Progress"; + import "PackageSlideShow"; + import "SlideShow"; import "CommandLine"; @@ -138,6 +140,26 @@ return addRepoSuccess; } + + void InitSlideShow(string description) + { + PackageSlideShow::InitPkgData(true); // force reinitialization + + // TODO FIXME: doesn't work properly for removed packages + list< map<string,any> > stages = [ + $[ + "name" : "packages", + "description": description, + "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes + "units" : `kb, + ], + ]; + + SlideShow::Setup(stages); + + SlideShow::MoveToStage("packages"); + } + /** ** Install all the specified packages ** return true if all installations were successful, false otherwise @@ -178,6 +200,9 @@ Pkg::TargetInit( "/", false ); if(Pkg::PkgSolve(true)) { + // initialize slideshow data (package counters) + InitSlideShow(_("Installing Packages...")); + print(_("Performing Installation...")); state = !(Pkg::PkgCommit(0)[0]:-1 < 0); } else //xxx no callback for resolve failures @@ -216,6 +241,9 @@ if(Pkg::PkgSolve(true)) { + // initialize slideshow data (package counters) + InitSlideShow(_("Installing Patterns...")); + state = !(Pkg::PkgCommit(0)[0]:-1 < 0); } else //xxx no callback for resolve failures { @@ -248,6 +276,9 @@ boolean state = true; if(Pkg::PkgSolve(true)) { + // initialize slideshow data (package counters) + InitSlideShow(_("Removing Packages...")); + state = !(Pkg::PkgCommit(0)[0]:-1 < 0); } else //xxx no callback for resolve failures { @@ -297,4 +328,4 @@ return nil; } -} \ No newline at end of file +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56581 - /tags/stable-2_18_3/backup/
by locilka＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: locilka Date: Thu Apr 2 14:59:09 2009 New Revision: 56581 URL: http://svn.opensuse.org/viewcvs/yast?rev=56581&view=rev Log: Created tag stable-2_18_3 for backup Added: tags/stable-2_18_3/backup/ - copied from r56580, trunk/backup/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56580 - /trunk/backup/src/ui.ycp
by locilka＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: locilka Date: Thu Apr 2 14:58:58 2009 New Revision: 56580 URL: http://svn.opensuse.org/viewcvs/yast?rev=56580&view=rev Log: Some more fixes ... Modified: trunk/backup/src/ui.ycp Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=56580&r1=5… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Thu Apr 2 14:58:58 2009 @@ -2093,10 +2093,7 @@ } if (Backup::cron_mode) { - // in cron mode only wait for subprocess - while ((string) SCR::Read (.process.read, backup_PID) != nil) { - sleep(wait_time); - } + sleep(wait_time); ret = nil; } else { @@ -2213,14 +2210,7 @@ if (Backup::cron_mode == true) { - // in cron mode only wait for subprocess - while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) - { - while ((string) SCR::Read (.process.read, backup_PID) != nil) { - // do nothing - } - sleep(wait_time); - } + sleep(wait_time); ret = nil; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56579 - /tags/stable-2_18_3/backup/
by locilka＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: locilka Date: Thu Apr 2 14:54:48 2009 New Revision: 56579 URL: http://svn.opensuse.org/viewcvs/yast?rev=56579&view=rev Log: Again and better Removed: tags/stable-2_18_3/backup/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56578 - in /trunk/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: aschnell Date: Thu Apr 2 14:22:25 2009 New Revision: 56578 URL: http://svn.opensuse.org/viewcvs/yast?rev=56578&view=rev Log: - fixed setting label for used swap partitions (bnc #490817) Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Apr 2 14:22:25 2009 @@ -4467,7 +4467,7 @@ false, 0, 16); static FsCapabilitiesX swapCaps (true, false, true, false, true, true, - true, 16, 64); + false, 16, 64); static FsCapabilitiesX jfsCaps (false, false, false, false, true, true, false, 16, 16*1024); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Apr 2 14:22:25 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 02 14:21:44 CEST 2009 - aschnell(a)suse.de + +- fixed setting label for used swap partitions (bnc #490817) + +------------------------------------------------------------------- Wed Apr 01 12:11:44 CEST 2009 - aschnell(a)suse.de - improved used-by handling during detection (fixes bnc #472803 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56577 - in /branches/SuSE-SLE-10-SP3-Branch/installation: VERSION package/yast2-installation.changes src/include/add-on-workflow.ycp
by locilka＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: locilka Date: Thu Apr 2 14:20:08 2009 New Revision: 56577 URL: http://svn.opensuse.org/viewcvs/yast?rev=56577&view=rev Log: - Removing a work around that broke the possibility to use several add-ons with the same URL (especially physical media-based ones) (bnc #475352). - 2.13.214 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Thu Apr 2 14:20:08 2009 @@ -1 +1 @@ -2.13.213 +2.13.214 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Thu Apr 2 14:20:08 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Apr 2 14:19:38 CEST 2009 - locilka(a)suse.cz + +- Removing a work around that broke the possibility to use several + add-ons with the same URL (especially physical media-based ones) + (bnc #475352). +- 2.13.214 + +------------------------------------------------------------------- Wed Apr 1 11:41:24 CEST 2009 - lslezak(a)suse.cz - do not log password in URL into y2log (bnc#441944) Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp Thu Apr 2 14:20:08 2009 @@ -576,24 +576,6 @@ // there is only one product on the given url if (size (products) == 1) { - // bugzilla #227605 - // this product with this url has been already installed or selected for installation - map <string, any> src_general_data = Pkg::SourceGeneralData (AddOnProduct::src_id); - string current_url = src_general_data["url"]:""; - if (current_url != "" && current_url != nil) { - y2milestone ("%1", already_used_urls); - if (already_used_urls[current_url]:"" == src_general_data["product_dir"]:"") { - // error pop-up - Popup::Message (_("The product on the media is already installed -or selected for installation.")); - y2milestone ("Deleting installation source %1 %2 (%3)", - AddOnProduct::src_id, current_url, src_general_data["product_dir"]:""); - Pkg::SourceDelete (AddOnProduct::src_id); - AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); - return `finish; - } - } - y2milestone ("Only one product available - skipping dialog"); map<string,any> prod = products[0]:$[]; if (! AddOnProduct::CheckProductDependencies ([prod["name"]:""])) @@ -723,21 +705,6 @@ string url = data["url"]:""; string product_dir = data["product_dir"]:""; - // bugzilla #227605 - // this product with this url has been already installed or selected for installation - if (url != "" && url != nil) { - if (already_used_urls[url]:"" == product_dir) { - // error pop-up - Popup::Message (_("The product on the media is already installed -or selected for installation.")); - y2milestone ("Deleting installation source %1 %2 (%3)", - AddOnProduct::src_id, url, product_dir); - Pkg::SourceDelete (AddOnProduct::src_id); - AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); - return `finish; - } - } - foreach (string product, selected, { AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id == -1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0