February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63455 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by jreidinger＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: jreidinger Date: Tue Feb 22 12:31:00 2011 New Revision: 63455 URL: http://svn.opensuse.org/viewcvs/yast?rev=63455&view=rev Log: changes Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=63455&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Feb 22 12:31:00 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Feb 22 12:31:00 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 22 11:30:20 UTC 2011 - jreidinger(a)novell.com + +- during probe of partitions don't try to mount encrypted one + (bnc#673906) +- 2.20.1 + +------------------------------------------------------------------- Mon Jan 10 12:56:07 UTC 2011 - jreidinger(a)novell.com - add missing file to tarball -- 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] r63454 - /trunk/bootloader/src/modules/BootGRUB.ycp
by jreidinger＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: jreidinger Date: Tue Feb 22 12:29:55 2011 New Revision: 63454 URL: http://svn.opensuse.org/viewcvs/yast?rev=63454&view=rev Log: during probe of partitions don't try to mount encrypted one (bnc#673906) Modified: trunk/bootloader/src/modules/BootGRUB.ycp Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Tue Feb 22 12:29:55 2011 @@ -147,8 +147,9 @@ list<string> others = (list<string>)Storage::GetForeignPrimary(); y2milestone ("Other primaries: %1", others); - // get list of all Linux Partitions on all real disks - list<map> other_l = (list<map>)Storage::GetOtherLinuxPartitions(); + // get list of all Linux Partitions on all real disks except encrypted ones ( as we don't know password and bootloader cannot boot from it directly) + list<map> other_l = (list<map>)filter( map p, Storage::GetOtherLinuxPartitions(), + ``(p["enc_type"]:`none!=`none)); y2milestone ("Other linux parts: %1", other_l); list<string> destroyed_partitions -- 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] r63453 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by jreidinger＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: jreidinger Date: Tue Feb 22 12:21:03 2011 New Revision: 63453 URL: http://svn.opensuse.org/viewcvs/yast?rev=63453&view=rev Log: changes Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=63453&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Feb 22 12:21:03 2011 @@ -1 +1 @@ -2.19.16 +2.20.0 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Feb 22 12:21:03 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 10 12:56:07 UTC 2011 - jreidinger(a)novell.com + +- add missing file to tarball + +------------------------------------------------------------------- Thu Dec 30 08:52:36 UTC 2010 - jreidinger(a)novell.com - allow to not specify vga mode for boot (bnc#643984) -- 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] r63452 - /tags/stable-2_20_6/country/
by jsuchome＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: jsuchome Date: Tue Feb 22 10:30:41 2011 New Revision: 63452 URL: http://svn.opensuse.org/viewcvs/yast?rev=63452&view=rev Log: Created tag stable-2_20_6 for country Added: tags/stable-2_20_6/country/ - copied from r63451, trunk/country/ -- 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] r63451 - in /trunk/country: VERSION package/yast2-country.changes timezone/data/timezone_raw.ycp timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: jsuchome Date: Tue Feb 22 10:30:04 2011 New Revision: 63451 URL: http://svn.opensuse.org/viewcvs/yast?rev=63451&view=rev Log: - more time zones (bnc#673425) - do not show time zones that conflict with others - 2.20.6 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/data/timezone_raw.ycp trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=63451&r1=634… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Feb 22 10:30:04 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Feb 22 10:30:04 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 22 10:27:40 CET 2011 - jsuchome(a)suse.cz + +- more time zones (bnc#673425) +- do not show time zones that conflict with others +- 2.20.6 + +------------------------------------------------------------------- Wed Nov 10 07:56:37 CET 2010 - jsuchome(a)suse.cz - fixed broken build Modified: trunk/country/timezone/data/timezone_raw.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/data/timezone_r… ============================================================================== --- trunk/country/timezone/data/timezone_raw.ycp (original) +++ trunk/country/timezone/data/timezone_raw.ycp Tue Feb 22 10:30:04 2011 @@ -544,7 +544,7 @@ // time zone "Asia/Kashgar" : _("Kashgar"), // CN // time zone - "Asia/Katmandu" : _("Katmandu"), + "Asia/Kathmandu" : _("Katmandu"), // time zone "Asia/Krasnoyarsk" : _("Krasnoyarsk"), // time zone @@ -815,13 +815,11 @@ // time zone "Pacific/Port_Moresby" : _("Port_Moresby"), // time zone - "Pacific/Dili" : _("Dili"), - // time zone "Pacific/Rarotonga" : _("Rarotonga"), // CK // time zone - "Pacific/Truk" : _("Chuuk"), // FM + "Pacific/Chuuk" : _("Chuuk"), // FM // time zone - "Pacific/Ponape" : _("Pohnpei"), // FM + "Pacific/Pohnpei" : _("Pohnpei"), // FM // time zone "Pacific/Kosrae" : _("Kosrae"), // FM // time zone Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.yc… ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Tue Feb 22 10:30:04 2011 @@ -67,6 +67,7 @@ "Mideast/Riyadh87" : "Asia/Riyadh", "Mideast/Riyadh88" : "Asia/Riyadh", "Mideast/Riyadh89" : "Asia/Riyadh", + "Europe/Vatican" : "Europe/Rome", ]; // on init, translate these to correct ones Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Feb 22 10:30:04 2011 @@ -386,14 +386,10 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { Timezone::Set (Timezone::timezone, true); + Timezone::call_mkinitrd = true; } Timezone::SetTime( year, month, day, hour, minute, second ); - - if (Timezone::hwclock == "--localtime" && !Stage::initial ()) - { - Timezone::call_mkinitrd = true; - } } } } @@ -480,7 +476,7 @@ foreach (map region, zonemap, { foreach (string key, string name, region["entries"]:$[], { - if (key != "Europe/Vatican") + if (!haskey (yast2zonetab, key)) zones[yast2zonetab[key]:key] = name; }); }); -- 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] r63450 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTree.cc
by tgoettlicher＠svn2.opensuse.org 21 Feb '11

21 Feb '11

Author: tgoettlicher Date: Mon Feb 21 17:33:41 2011 New Revision: 63450 URL: http://svn.opensuse.org/viewcvs/yast?rev=63450&view=rev Log: - Fixed unselecting items for tree widget (bnc #673801) - V 2.20.4 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63450&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Mon Feb 21 17:33:41 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Feb 21 17:33:41 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 21 17:37:47 CET 2011 - tgoettlicher(a)suse.de + +- Fixed unselecting items for tree widget (bnc #673801) +- V 2.20.4 + +------------------------------------------------------------------- Wed Feb 16 11:14:10 CET 2011 - tgoettlicher(a)suse.de - Fixed event handling in context menu (bnc #671147) Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=63450&r1=63… ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Mon Feb 21 17:33:41 2011 @@ -175,6 +175,7 @@ YQTreeItem * yqTreeItem = (YQTreeItem *) treeItem->data(); YUI_CHECK_PTR( yqTreeItem ); + if ( selected ) { selectItem( yqTreeItem ); @@ -246,6 +247,23 @@ YTree::deselectAllItems(); _qt_treeWidget->clearSelection(); + + if ( hasMultiSelection() ) + { + QTreeWidgetItemIterator it( _qt_treeWidget); + while (*it) + { + YQTreeItem * treeItem = dynamic_cast<YQTreeItem *> (*it); + + if ( treeItem ) + { + treeItem->setCheckState( 0, Qt::Unchecked ); + treeItem->origItem()->setSelected( false ); + } + ++it; + } + } + } -- 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] r63449 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp snapper.ycp wizards.ycp
by jsuchome＠svn2.opensuse.org 21 Feb '11

21 Feb '11

Author: jsuchome Date: Mon Feb 21 16:16:53 2011 New Revision: 63449 URL: http://svn.opensuse.org/viewcvs/yast?rev=63449&view=rev Log: added restore function Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp branches/tmp/jsuchome/snapper/src/snapper.ycp branches/tmp/jsuchome/snapper/src/wizards.ycp Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Mon Feb 21 16:16:53 2011 @@ -35,6 +35,7 @@ textdomain "snapper"; import "FileUtils"; +import "Label"; import "Progress"; @@ -68,8 +69,8 @@ map ret = $[]; - string file1 = sformat ("%1/%2/snapshot/%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2/snapshot/%3", snapshots_path, new, file); + string file1 = sformat ("%1/%2/snapshot%3", snapshots_path, old, file); + string file2 = sformat ("%1/%2/snapshot%3", snapshots_path, new, file); if (new == 0) file2 = file; @@ -160,36 +161,52 @@ } /** - * Write all snapper settings - * @return true on success + * Copy given files from selected snapshot to current filesystem */ -global boolean Write() { +global boolean RestoreFiles (integer snapshot_num, list<string> files) { - /* Snapper read dialog caption */ - string caption = _("Saving snapper Configuration"); + boolean ret = true; + y2milestone ("going to restore files %1", files); - integer steps = 2; + UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing(1.5), `VBox ( + `HSpacing (60), + // label for log window + `LogView (`id (`log), _("Restoring Files..."), 8, 0), + `ProgressBar (`id (`progress), "", size (files), 0), + `PushButton (`id (`ok), Label::OKButton ()) + ), `HSpacing (1.5))); + + UI::ChangeWidget (`id (`ok), `Enabled, false); + integer progress = 0; + foreach (string file, files, { + + UI::ChangeWidget (`id (`progress ), `Value, progress); + + string orig = sformat ("%1/%2/snapshot%3", snapshots_path, snapshot_num, file); + + string dir = substring (file, 0, findlastof (file, "/")); + y2internal ("copying file %1 to %2 (dir: %3)", orig, file, dir); + if (FileUtils::CheckAndCreatePath (dir)) + { + SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", orig, file)); + UI::ChangeWidget (`id (`log), `LastLine, file + "\n"); + } + else + { + // log entry (%1 is file name) + UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 skipped\n"), file)); + } + sleep (100); + progress = progress + 1; + }); - Progress::New(caption, " ", steps, [ - /* Progress stage 1/2 */ - _("Write the settings"), - /* Progress stage 2/2 */ - _("Run SuSEconfig") - ], [ - /* Progress step 1/2 */ - _("Writing the settings..."), - /* Progress step 2/2 */ - _("Running SuSEconfig..."), - /* Progress finished */ - _("Finished") - ], - "" - ); + UI::ChangeWidget (`id (`progress ), `Value, progress); + UI::ChangeWidget (`id (`ok), `Enabled, true); - Progress::NextStage(); - Progress::NextStage (); - Progress::NextStage(); - return true; + UI::UserInput (); + UI::CloseDialog (); + + return ret; } Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dial… ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Mon Feb 21 16:16:53 2011 @@ -58,16 +58,6 @@ } /** - * Write settings dialog - * @return `abort if aborted and `next otherwise - */ -symbol WriteDialog() { - Wizard::RestoreHelp(HELPS["write"]:""); - boolean ret = Snapper::Write(); - return ret ? `next : `abort; -} - -/** * Summary dialog * @return dialog result */ @@ -255,6 +245,7 @@ // helper function: update the global map with directory tree structure map<string,map> update_tree_map (map<string,map> current_map, list<string> path_list) { + y2internal ("current path list: %1", path_list); string first = path_list[0]:""; if (current_map[first]:nil == nil) @@ -272,7 +263,7 @@ } // save full paths of files marked as modified - map files_index = $[]; + map<string,map> files_index = $[]; // go through the map defining filesystem tree and create the widget items list<term> generate_tree_items (string current_path, map<string,map> current_branch) { @@ -483,8 +474,33 @@ current_file = (string) UI::QueryWidget (`id(`tree),`CurrentItem); if (current_file == nil) current_file = ""; - // events in tree - if (ret == `tree) + // tree checkbox clicked + if (ret == `tree && event["EventReason"]:"" == "ValueChanged") + { + // non-tracked file (so, it should be directory) + if (current_file != "" && files_index[current_file]:$[] == $[]) + { +y2internal ("event: %1", event); + // FIXME not possible to uncheck an item... + integer len = size (current_file); + list<string> sel= []; + foreach (string key, map m, files_index, { + // FIXME this could get too slow... build a structure while creating items? + if (substring (key, 0, len) == current_file) + { + y2security ("select '%1'", key); + sel = add (sel, key); + } + }); + if (sel != []) + { + UI::ChangeWidget (`tree, `SelectedItems, sel); + } + } + + } + // other tree events + else if (ret == `tree) { set_entry_term (); UI::NormalCursor (); @@ -517,11 +533,9 @@ } else if (ret == `next) { list<string> files = (list<string>) UI::QueryWidget (`id (`tree), `SelectedItems); - y2internal ("files: %1", files); files = filter (string file, files, { return haskey (files_index, file); }); - y2internal ("files: %1", files); if (files == []) { @@ -529,16 +543,16 @@ Popup::Message (_("No file was selected for restoring")); continue; } - // FIXME restore from PRE or POST? + // FIXME restore from PRE or POST? (PRE by default) // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), - // popup message - sformat (_("These files will be restored from snapshot %1: %2 Are you sure?"), - snapshot_name, mergestring (files, " ")), + // popup message, %1 is snapshot number, %2 list of files + sformat (_("These files will be copied from snapshot %1 to current system:%2Are you sure?"), + previous_num, mergestring (files, " ")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { - y2milestone ("restoring files..."); - // TODO copy the files + Snapper::RestoreFiles (previous_num, files); + break; } continue; } Modified: branches/tmp/jsuchome/snapper/src/snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/snapper.ycp Mon Feb 21 16:16:53 2011 @@ -49,33 +49,11 @@ include "snapper/wizards.ycp"; map cmdline_description = $[ - "id" : "snapper", - /* Command line help text for the Xsnapper module */ - "help" : _("Configuration of snapper"), - "guihandler" : SnapperSequence, - "initialize" : Snapper::Read, - "finish" : Snapper::Write, - "actions" : $[ - // FIXME TODO: fill the functionality description here - ], - "options" : $[ - // FIXME TODO: fill the option descriptions here - ], - "mappings" : $[ - // FIXME TODO: fill the mappings of actions and options here - ] + "id" : "snapper", + "help" : _("Configuration of system snapshots"), + "guihandler": SnapperSequence, ]; -/* is this proposal or not? */ -boolean propose = false; -list args = WFM::Args(); -if(size(args) > 0) { - if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { - y2milestone("Using PROPOSE mode"); - propose = true; - } -} - /* main ui function */ any ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); Modified: branches/tmp/jsuchome/snapper/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/wiza… ============================================================================== --- branches/tmp/jsuchome/snapper/src/wizards.ycp (original) +++ branches/tmp/jsuchome/snapper/src/wizards.ycp Mon Feb 21 16:16:53 2011 @@ -75,7 +75,6 @@ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ), - "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ @@ -86,12 +85,8 @@ ], "main" : $[ `abort : `abort, - `next : "write" - ], - "write" : $[ - `abort : `abort, `next : `next - ] + ], ]; Wizard::CreateDialog (); -- 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] r63448 - /tags/stable-2_20_3/wagon/
by locilka＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: locilka Date: Fri Feb 18 15:56:45 2011 New Revision: 63448 URL: http://svn.opensuse.org/viewcvs/yast?rev=63448&view=rev Log: Created tag stable-2_20_3 for wagon Added: tags/stable-2_20_3/wagon/ - copied from r63447, trunk/wagon/ -- 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] r63447 - in /trunk/wagon: VERSION package/yast2-wagon.changes src/config/online_migration-SLE.xml src/config/online_migration-openSUSE.xml src/config/online_migration.xml yast2-wagon.spec.in
by locilka＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: locilka Date: Fri Feb 18 15:56:22 2011 New Revision: 63447 URL: http://svn.opensuse.org/viewcvs/yast?rev=63447&view=rev Log: - yast2-wagon control files have been moved to separate packages yast2-wagon-control-SLE and yast2-wagon-control-openSUSE. - 2.20.3 Added: trunk/wagon/src/config/online_migration-SLE.xml - copied unchanged from r63132, trunk/wagon/src/config/online_migration.xml trunk/wagon/src/config/online_migration-openSUSE.xml Removed: trunk/wagon/src/config/online_migration.xml Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=63447&r1=63446… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Fri Feb 18 15:56:22 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Fri Feb 18 15:56:22 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 18 14:22:27 CET 2011 - locilka(a)suse.cz + +- yast2-wagon control files have been moved to separate packages + yast2-wagon-control-SLE and yast2-wagon-control-openSUSE. +- 2.20.3 + +------------------------------------------------------------------- Wed Jan 5 10:58:15 CET 2011 - locilka(a)suse.cz - Added more explicit RPM requirements (BNC #613820, Comment #22) Added: trunk/wagon/src/config/online_migration-openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration-openSUSE.xml (added) +++ trunk/wagon/src/config/online_migration-openSUSE.xml Fri Feb 18 15:56:22 2011 @@ -0,0 +1,265 @@ +<?xml version="1.0"?> + +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + + + + + <textdomain>online-migration</textdomain> + + <globals> +  + <debug_workflow config:type="boolean">false</debug_workflow> + + <default_subworkflow>manual</default_subworkflow> + + <subworkflows config:type="list"> +  + <subworkflow> + <name>running_by_applet</name> + <modules config:type="list"> + <module>welcome</module> + <module>update_online_mechanism</module> + <module>install_migration_products</module> + <module>wagon_modify_repositories</module> + <module>prepare_progress</module> + <module>point_of_no_return</module> + <module>wagon_kickoff</module> + <module>wagon_rpmcopy</module> + <module>suseconfig_after_update</module> + <module>finished</module> + </modules> + <proposals config:type="list"> + <proposal>wagon_proposal</proposal> + </proposals> + </subworkflow> + + <subworkflow> + <name>manual</name> + <modules config:type="list"> + <module>welcome</module> + <module>update_online_mechanism</module> + <module>install_migration_products</module> + <module>wagon_manual_url_repositories</module> + <module>wagon_modify_repositories</module> + <module>wagon_check_repositories</module> + <module>prepare_progress</module> + <module>point_of_no_return</module> + <module>wagon_kickoff</module> + <module>wagon_rpmcopy</module> + <module>suseconfig_after_update</module> + <module>finished</module> + </modules> + <proposals config:type="list"> + <proposal>wagon_proposal</proposal> + </proposals> + </subworkflow> + +  + <subworkflow> + <name>PatchCD</name> + <modules config:type="list"> + <module>welcome</module> + <module>wagon_custom_url</module> + <module>wagon_selfupdate_from_url</module> + <module>prepare_progress</module> + <module>point_of_no_return</module> + <module>wagon_kickoff</module> + <module>wagon_rpmcopy</module> + <module>suseconfig_after_update</module> + <module>finished</module> + </modules> + <proposals config:type="list"> + <proposal>wagon_proposal</proposal> + </proposals> + </subworkflow> + </subworkflows> + </globals> + + <software> +  + <packages_affecting_pkg_manager config:type="list"> + <package>yast2-wagon</package> + <package>yast2-online-update</package> + <package>yast2-pkg-bindings</package> + <package>yast2-update</package> + <package>libzypp</package> + </packages_affecting_pkg_manager> + </software> + + <proposals config:type="list"> + <proposal> + <label>Distribution Upgrade Settings</label> + <mode>update</mode> + <stage>normal</stage> + <name>wagon_proposal</name> + <unique_id>wagon_proposal</unique_id> + <enable_skip>no</enable_skip> + + <proposal_modules config:type="list"> + <proposal_module>add-on</proposal_module> + <proposal_module>wagon_update</proposal_module> + <proposal_module>packages</proposal_module> + <proposal_module>backup</proposal_module> + </proposal_modules> + </proposal> + </proposals> + + <workflows config:type="list"> + + <workflow> + <defaults> + <archs>all</archs> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </defaults> + + <label>Online Migration</label> +  + <mode>update</mode> + <stage>normal</stage> + + <modules config:type="list"> + <module> + <heading>yes</heading> + <label>Preparation</label> + </module> + +  + <module> + <label>Welcome</label> + <name>welcome</name> + <execute>welcome_in_wagon</execute> + <enable_back>no</enable_back> + </module> + +  + <module> + <label>Renew Update Stack</label> + <name>update_online_mechanism</name> + <execute>wagon_selfupdate</execute> + </module> + +  + <module> + <label>Migration Configuration</label> + <name>install_migration_products</name> + <execute>wagon_migration_products</execute> + </module> + +  + <module> + <label>Migration Configuration</label> + <name>wagon_manual_url_repositories</name> + <execute>wagon_repositories_handler</execute> + </module> + +  + <module> + <label>Migration Configuration</label> + <name>wagon_selfupdate_from_url</name> + <execute>wagon_selfupdate</execute> + </module> + +  + <module> + <label>Migration Configuration</label> + <name>wagon_custom_url</name> + <execute>wagon_custom_url</execute> + </module> + + <module> + <label>Migration Configuration</label> + <name>wagon_modify_repositories</name> + <execute>wagon_modify_repositories</execute> + </module> + + <module> + <label>Migration Configuration</label> + <name>wagon_check_repositories</name> + <execute>wagon_repositories_handler</execute> + </module> + + <module> + <heading>yes</heading> + <label>Migration</label> + </module> + +  + <module> + <label>Update</label> + <name>wagon_proposal</name> + <execute>inst_proposal</execute> + <proposal>wagon_proposal</proposal> + </module> + +  + <module> + <label>Update</label> + <name>prepare_progress</name> + <execute>inst_prepareprogress</execute> + </module> + +  + <module> + <label>Update</label> + <name>point_of_no_return</name> + <execute>wagon_point_of_no_return</execute> + </module> + + <module> + <label>Update</label> + <name>wagon_kickoff</name> + <execute>inst_kickoff</execute> + </module> + +  + <module> + <label>Update</label> + <name>wagon_rpmcopy</name> + <execute>inst_rpmcopy</execute> + </module> + + <module> + <label>Update</label> + <name>suseconfig_after_update</name> + <execute>inst_suseconfig</execute> + </module> + +  + <module> + <label>Finished</label> + <name>finished</name> + <execute>wagon_congratulate</execute> + </module> + </modules> + </workflow> + + </workflows> + +</productDefines> Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=63… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Fri Feb 18 15:56:22 2011 @@ -15,9 +15,6 @@ # Counting packages directly in packages proposal (BNC #573482) Requires: yast2-update >= 2.18.7 -# Prevent from crashes (BNC #551613) -Requires: yast2-registration >= 2.18.0 - BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update # xmllint @@ -26,12 +23,15 @@ # control.rng BuildRequires: yast2-installation >= 2.17.44 -Provides: yast2-online-update-frontend:/usr/share/applications/YaST2/cd_update.desktop +Provides: yast2-online-update-frontend:%{_datadir}/applications/YaST2/cd_update.desktop # See BNC #613820, Comment #22 Conflicts: yast2-perl-bindings < 2.19.0 Conflicts: yast2-storage < 2.19.0 +# Requires a control file +Requires: wagon-control-file + BuildArchitectures: noarch Summary: YaST2 - Migration Tool for Service Packs @@ -46,8 +46,12 @@ @BUILD@ @INSTALL@ +xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng %{buildroot}%{_datadir}/YaST2/control/*.xml +# ghost file +touch %{buildroot}%{_datadir}/YaST2/control/online_migration.xml @CLEAN@ +rm -rf %{buildroot}%%{_datadir}/YaST2/control/online_migration.xml %files %defattr(-,root,root) @@ -55,7 +59,72 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc -%dir /usr/share/YaST2/control @desktopdir@/*.desktop -/usr/share/YaST2/control/*.xml %doc @docdir@ +%exclude %{_datadir}/YaST2/control +%exclude %{_datadir}/YaST2/control/*.xml + +### +# +# yast2-wagon-control-openSUSE +# +### + +%package control-openSUSE + +# Generic 'provides' +Provides: wagon-control-file + +Group: System/YaST +License: GPL v2 or later + +Conflicts: otherproviders(wagon-control-file) +Supplements: packageand(yast2-wagon:branding-openSUSE) + +Summary: YaST Wagon control file for openSUSE + +%description control-openSUSE +YaST Wagon control file for openSUSE + +%post control-openSUSE +ln -sf online_migration-SLE.xml %{_datadir}/YaST2/control/online_migration.xml + +%files control-openSUSE +%defattr(-,root,root) +%dir %{_datadir}/YaST2/control +%{_datadir}/YaST2/control/online_migration-openSUSE.xml +%ghost %{_datadir}/YaST2/control/online_migration.xml + +### +# +# yast2-wagon-control-SLE +# +### + +%package control-SLE + +# Generic 'provides' +Provides: wagon-control-file + +Group: System/YaST +License: GPL v2 or later + +# Prevent from crashes (BNC #551613) +Requires: yast2-registration >= 2.18.0 + +Conflicts: otherproviders(wagon-control-file) +Supplements: packageand(yast2-wagon:branding-SLE) + +Summary: YaST Wagon control file for SLE + +%description control-SLE +YaST Wagon control file for SLE + +%post control-SLE +ln -sf online_migration-SLE.xml %{_datadir}/YaST2/control/online_migration.xml + +%files control-SLE +%defattr(-,root,root) +%dir %{_datadir}/YaST2/control +%{_datadir}/YaST2/control/online_migration-SLE.xml +%ghost %{_datadir}/YaST2/control/online_migration.xml -- 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] r63446 - /tags/stable-2_20_2/firstboot/
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:31:28 2011 New Revision: 63446 URL: http://svn.opensuse.org/viewcvs/yast?rev=63446&view=rev Log: Created tag stable-2_20_2 for firstboot Added: tags/stable-2_20_2/firstboot/ - copied from r63445, trunk/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0