August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39893 - /trunk/devtools/devtools/bin/y2makeall
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 13:31:43 2007 New Revision: 39893 URL: http://svn.opensuse.org/viewcvs/yast?rev=39893&view=rev Log: ignore bogus dependency Modified: trunk/devtools/devtools/bin/y2makeall Modified: trunk/devtools/devtools/bin/y2makeall URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2makeall?… ============================================================================== --- trunk/devtools/devtools/bin/y2makeall (original) +++ trunk/devtools/devtools/bin/y2makeall Thu Aug 2 13:31:43 2007 @@ -64,6 +64,7 @@ ( "yast2-installation" => 1, "yast2-nis-server" => 1, + "yast2-gtk" => 1, "yast2-inetd" => 1, "yast2_theme" => 1 ); -- 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] r39892 - /trunk/devtools/devtools/bin/y2makeall
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 13:28:33 2007 New Revision: 39892 URL: http://svn.opensuse.org/viewcvs/yast?rev=39892&view=rev Log: ignore bogus dependency Modified: trunk/devtools/devtools/bin/y2makeall Modified: trunk/devtools/devtools/bin/y2makeall URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2makeall?… ============================================================================== --- trunk/devtools/devtools/bin/y2makeall (original) +++ trunk/devtools/devtools/bin/y2makeall Thu Aug 2 13:28:33 2007 @@ -63,6 +63,7 @@ my %ignored_requires = ( "yast2-installation" => 1, + "yast2-nis-server" => 1, "yast2-inetd" => 1, "yast2_theme" => 1 ); -- 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] r39891 - /trunk/ruby-bindings/RPMNAME
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 13:20:59 2007 New Revision: 39891 URL: http://svn.opensuse.org/viewcvs/yast?rev=39891&view=rev Log: Added at least minimum requirements for package to NOT mess up everbody's build Added: trunk/ruby-bindings/RPMNAME Added: trunk/ruby-bindings/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/RPMNAME?rev=39891&… ============================================================================== --- trunk/ruby-bindings/RPMNAME (added) +++ trunk/ruby-bindings/RPMNAME Thu Aug 2 13:20:59 2007 @@ -0,0 +1 @@ +yast2-ruby-bindings -- 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] r39890 - in /trunk/packager: package/yast2-packager.changes src/modules/PackageCallbacks.ycp
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 12:52:18 2007 New Revision: 39890 URL: http://svn.opensuse.org/viewcvs/yast?rev=39890&view=rev Log: - beep when another medium is needed (#45527, FATE #120296) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageCallbacks.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Aug 2 12:52:18 2007 @@ -6,6 +6,7 @@ a different repository can registered - improved download progress callback handlers (#292629) - fixed "tick" callback progress +- beep when another medium is needed (#45527, FATE #120296) ------------------------------------------------------------------- Tue Jul 31 14:24:52 CEST 2007 - locilka(a)suse.cz Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCall… ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Thu Aug 2 12:52:18 2007 @@ -699,6 +699,9 @@ UI::ReplaceWidget(`id(`info), `Empty() ); } + // notification + UI::Beep(); + any r = nil; repeat { -- 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] r39889 - /tags/stable-2_15_1/product-creator/
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 11:50:42 2007 New Revision: 39889 URL: http://svn.opensuse.org/viewcvs/yast?rev=39889&view=rev Log: Created tag stable-2_15_1 for product-creator Added: tags/stable-2_15_1/product-creator/ - copied from r39888, trunk/product-creator/ -- 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] r39888 - in /trunk/product-creator: ./ agent-kiwi/ package/ src/
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 11:50:37 2007 New Revision: 39888 URL: http://svn.opensuse.org/viewcvs/yast?rev=39888&view=rev Log: - "installation source" changed to "repository" - mark the output product as "base" - added simplified UI for kiwi - 2.15.1 Modified: trunk/product-creator/VERSION trunk/product-creator/agent-kiwi/ag_kiwi trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/Makefile.am trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/kiwi.desktop trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/yast2-product-creator.spec.in Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=3988… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Aug 2 11:50:37 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/agent-kiwi/ag_ki… ============================================================================== --- trunk/product-creator/agent-kiwi/ag_kiwi (original) +++ trunk/product-creator/agent-kiwi/ag_kiwi Thu Aug 2 11:50:37 2007 @@ -29,7 +29,7 @@ my $optionsNodeList = $systemTree -> getElementsByTagName ("preferences"); my $usrdataNodeList = $systemTree -> getElementsByTagName ("users"); my $packageNodeList = $systemTree -> getElementsByTagName ("packages"); - my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); +# my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); my $key = "packages"; $retmap{$key} = {}; @@ -38,6 +38,8 @@ my $type = $node -> getAttribute ("type"); y2milestone ("package list type: $type"); $retmap{$key}{$type} = {}; + my $patterntype = $node -> getAttribute ("patternType"); + $retmap{$key}{$type}{"patternType"} = $patterntype if $patterntype; foreach my $tag ("package", "opensusePattern", "ignore") { my @sw_list = (); foreach my $element ($node -> getElementsByTagName ($tag)) { @@ -92,6 +94,10 @@ $retmap{$tag} = $element-> get_node(1)->textContent () if ($element); } + my $image = $systemTree -> getElementsByTagName ("image")->get_node (1); + my $image_name = $image -> getAttribute ("name"); + $retmap{"name"} = $image_name if $image_name; + $retmap{"users"} = {}; foreach my $usernode ($usrdataNodeList -> get_nodelist()) { my $group = $usernode -> getAttribute("group"); @@ -128,26 +134,25 @@ } } $key = "repository"; - $retmap{$key} = {}; + my @repolist = (); for (my $i=1;$i<= $repositNodeList->size();$i++) { my $node = $repositNodeList -> get_node($i); - my $type = $node -> getAttribute ("type"); - y2milestone ("repo type: $type"); - my $status = $node -> getAttribute ("status"); - $retmap{$key}{$type} = {}; - $retmap{$key}{$type}{"status"} = $status if $status; - foreach my $tag ("source") { - # maybe it doesn't have sense to have list of sources in one repo... - my @list = (); - foreach my $element ($node -> getElementsByTagName ($tag)) { - my %item = (); - my $path = $element -> getAttribute ("path"); - $item{"path"} = $path if $path; - push @list, \%item if %item; - } - $retmap{$key}{$type}{$tag} = \@list if @list; + my %repo = (); + foreach my $tag ("type", "status") { + my $val = $node -> getAttribute ($tag); + $repo{$tag} = $val if $val; + } + my @list = (); # maybe list is not needed here... + foreach my $element ($node -> getElementsByTagName ("source")) { + my %item = (); + my $path = $element -> getAttribute ("path"); + $item{"path"} = $path if $path; + push @list, \%item if %item; } + $repo{"source"} = \@list if @list; + push @repolist, \%repo if %repo; } + $retmap{$key} = \@repolist if @repolist; ycp::Return (\%retmap, 1); } elsif ($command eq "result") Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Aug 2 11:50:37 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 2 09:34:21 CEST 2007 - jsuchome(a)suse.cz + +- "installation source" changed to "repository" +- mark the output product as "base" +- added simplified UI for kiwi +- 2.15.1 + +------------------------------------------------------------------- Wed Jul 25 09:41:05 CEST 2007 - lslezak(a)suse.cz - fixed "Back" button behavior in the Isolinux configuration Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Thu Aug 2 11:50:37 2007 @@ -68,9 +68,7 @@ map get_source_value (string source) { string type = "yast2"; - string source_path = source; - if (substring (source, 0, 1) == "/") - source_path = "dir://" + source; + string source_path = adapt_source_path (source); foreach (map sourcemap, all_sources, { integer srcid = sourcemap["SrcId"]:-1; @@ -90,7 +88,7 @@ "__children": [ $[ "__key" : "source", - "path" : source + "path" : source_path ] ] ]; Modified: trunk/product-creator/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Makefile.am?… ============================================================================== --- trunk/product-creator/src/Makefile.am (original) +++ trunk/product-creator/src/Makefile.am Thu Aug 2 11:50:37 2007 @@ -21,7 +21,8 @@ kiwi_dialogs.ycp desktop_DATA = \ - product-creator.desktop + product-creator.desktop \ + kiwi.desktop module_DATA = \ ProductCreator.ycp \ Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Thu Aug 2 11:50:37 2007 @@ -93,6 +93,9 @@ // What we want to create with kiwi global string kiwi_task = "iso"; +// if the YaST sources should be enabled when opening package selector +global boolean enable_sources = true; + // original source configuration, needed to reset the package manager list<map<string,any> > original_config = nil; @@ -1493,6 +1496,9 @@ // remove the meta information from content file Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content' > '%1/content.new'", String::Quote(skel_root))); Exec(sformat("/bin/mv '%1/content.new' '%1/content'", String::Quote(skel_root))); + // mark the final product as 'base' + if (SCR::Execute (.target.bash, sformat("/usr/bin/grep '^TYPE' '%1/content'", String::Quote(skel_root))) != 0) + Exec(sformat("echo 'TYPE base' >> '%1/content'", String::Quote(skel_root))); // recreate the index file // FIXME: use create_directory when it supports parameter with spaces @@ -1889,6 +1895,10 @@ global define void enableSources()``{ + // used by standalone kiwi UI, which does onw sources handling... + if (!enable_sources) + return; + // TODO FIXME: use better way to reset the source config in the package manager if (original_config != nil) { Modified: trunk/product-creator/src/kiwi.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi.desktop… ============================================================================== --- trunk/product-creator/src/kiwi.desktop (original) +++ trunk/product-creator/src/kiwi.desktop Thu Aug 2 11:50:37 2007 @@ -19,5 +19,5 @@ Exec=/sbin/yast2 kiwi Name=Live Image Creator -GenericName=Create the Live or XEN image +GenericName=Create the Live, USB or XEN image X-KDE-SubstituteUID=true Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Thu Aug 2 11:50:37 2007 @@ -660,7 +660,6 @@ { if (Kiwi::WriteConfigXML (KiwiConfig, kiwi_task)) { - /* string out_dir = KiwiConfig["iso-directory"]:""; if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir)) { @@ -679,7 +678,6 @@ } ret = true; } - */ } } if (ret) @@ -707,12 +705,13 @@ map<string,string> content = ProductCreator::ReadContentFile(src_id); KiwiConfig = ProductCreator::Config; +y2internal ("sources: %1", KiwiConfig["sources"]:nil); // busy popup Popup::ShowFeedback (_("Reading current live image configuration..."), _("Please wait...")); map default_dirmap = $[ "iso" : sformat ("%1/kwliveDVD-suse-10.3", images_dir), - "xen" : sformat ("%1/buildhost-suse-10.1", images_dir), + "xen" : sformat ("%1/buildhost-suse-SLES10", images_dir), "usb" : sformat ("%1/kwliveDVD-suse-10.3", images_dir), "vmx" : sformat ("%1/kwliveDVD-suse-10.3", images_dir), ]; @@ -1388,7 +1387,7 @@ string kiwi_configuration = Config["kiwi_configuration_" + kiwi_task]:""; string name = Config["name"]:""; string out_dir = Config["iso-directory"]:""; - map <integer,string> repositories = $[];//Config["sources"]:[]; FIXME! + map <integer,string> repositories = $[]; // on start, disable all sources (-> move to client?) if (Config == $[]) @@ -1442,7 +1441,6 @@ kiwi_configuration = dir; Config = eval (Kiwi::ReadConfigXML (kiwi_configuration)); name = Config["name"]:""; -// repositories = []; repositories = $[]; foreach (map repo, (list<map>) Config["repository"]:[], { string source = repo["source",0,"path"]:""; @@ -1459,7 +1457,7 @@ else id = Pkg::SourceCreate (url + source, ""); if (id != -1) - repositories[id] = source;// FIXME or url? + repositories[id] = url + source; } }); UI::ChangeWidget (`id (`config), `Value, name); @@ -1652,6 +1650,7 @@ integer id, string repo, repositories, ``(repo)); ProductCreator::kiwi_task = kiwi_task; ProductCreator::Config = Config; + ProductCreator::enable_sources = false; } y2milestone("Returning %1", ret); return (symbol) ret; Modified: trunk/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-cr… ============================================================================== --- trunk/product-creator/yast2-product-creator.spec.in (original) +++ trunk/product-creator/yast2-product-creator.spec.in Thu Aug 2 11:50:37 2007 @@ -30,9 +30,11 @@ %dir @yncludedir@/product-creator @yncludedir@/product-creator/* @clientdir@/product-creator.ycp +@clientdir@/kiwi.ycp @moduledir@/*.ycp @moduledir@/*.ybc @desktopdir@/product-creator.desktop +@desktopdir@/kiwi.desktop @ybindir@/y2mkiso %doc @docdir@ %dir @ydatadir@/product-creator -- 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] r39887 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAskForDirectory.cc NCAskForFile.cc
by gs＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: gs Date: Thu Aug 2 11:38:57 2007 New Revision: 39887 URL: http://svn.opensuse.org/viewcvs/yast?rev=39887&view=rev Log: remove addChild() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Thu Aug 2 11:38:57 2007 @@ -95,67 +95,64 @@ void NCAskForExistingDirectory::createLayout( const YCPString & iniDir, const YCPString & headline ) { - + // FIXME - check all options settings! YWidgetOpt opt; // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - addChild( split ); + + // addChild() is obsolete (handled by new libyui) opt.notifyMode.setValue( false ); // the headline - NCLabel * head = new NCLabel( split, headline->toString(), true, false ); // isHeading = true - split->addChild( head ); + new NCLabel( split, headline->toString(), true, false ); // isHeading = true - split->addChild( new NCSpacing( split, YD_VERT, false, 0.4 ) ); + new NCSpacing( split, YD_VERT, false, 0.4 ); - opt.isHStretchable.setValue( true ); + opt.isHStretchable.setValue( true ); // see hSplit NCFrame * frame = new NCFrame( split, "" ); - NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); + //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); - opt.isEditable.setValue( false ); - opt.notifyMode.setValue( true ); + opt.isEditable.setValue( false ); // see dirName + opt.notifyMode.setValue( true ); // see dirName + // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false dirName->setNotify( true ); - frame->addChild( dirName ); + YStringWidgetID * dirID = new YStringWidgetID( idDirName->name() ); dirName->setId( dirID ); - vSplit->addChild( new NCSpacing( vSplit, YD_VERT, false, 0.6 ) ); - - split->addChild( frame ); + //new NCSpacing( vSplit, YD_VERT, false, 0.6 ); // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); - split->addChild( hSplit ); + // label for checkbox detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails->name() ); detailed->setId( detailsID ); //hSplit->addChild( new NCSpacing( hSplit, opt, 0.1, true, false ) ); - hSplit->addChild( new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ) ); // stretchable = true - hSplit->addChild( detailed ); + new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true // add the list of directories dirList = new NCDirectoryTable( split, opt, NCFileTable::T_Overview, iniDir ); YStringWidgetID * dirListID = new YStringWidgetID( idDirList->name() ); dirList->setId( dirListID ); - split->addChild( dirList ); //split->addChild( new NCSpacing( split, opt, 0.4, false, true ) ); - split->addChild( new NCSpacing( split, YD_VERT, false, 0.4 ) ); + new NCSpacing( split, YD_VERT, false, 0.4 ); // HBox for the buttons NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); - split->addChild( hSplit1 ); + opt.isHStretchable.setValue( true ); //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.2, true, false ) ); - hSplit1->addChild( new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ) ); // stretchable = true + new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true // add the OK button opt.key_Fxx.setValue( 10 ); @@ -164,10 +161,8 @@ YStringWidgetID * okID = new YStringWidgetID (idOk->name() ); okButton->setId( okID ); - hSplit1->addChild( okButton ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.4, true, false ) ); - hSplit1->addChild( new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ) ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); // add the Cancel button opt.key_Fxx.setValue( 9 ); @@ -176,9 +171,8 @@ YStringWidgetID * cancelID = new YStringWidgetID (idCancel->name() ); cancelButton->setId( cancelID ); - hSplit1->addChild( cancelButton ); //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.2, true, false ) ); - hSplit1->addChild( new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ) ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); } @@ -275,7 +269,7 @@ if (postevent.result.isNull ()) return true; - // FIXME ??? + // FIXME ??? - what about 'i' #if 0 dirName->itemAdded( postevent.result->asString(), i, Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Thu Aug 2 11:38:57 2007 @@ -133,6 +133,8 @@ const string & headline, bool edit ) { + // FIXME - check all option settings + YWidgetOpt opt; string startDir; @@ -140,45 +142,42 @@ // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - addChild( split ); + + // addChild() id obsolete (handled by new libyui) opt.notifyMode.setValue( false ); //the headline //opt.isHeading.setValue( true ); - NCLabel * head = new NCLabel( split, headline, true, false ); // isHeading = true - split->addChild( head ); + new NCLabel( split, headline, true, false ); // isHeading = true - split->addChild( new NCSpacing( split, YD_VERT, false, 0.4 ) ); + new NCSpacing( split, YD_VERT, false, 0.4 ); opt.isHStretchable.setValue( true ); NCFrame * frame = new NCFrame( split, "" ); - NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); + //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); opt.isEditable.setValue( false ); opt.notifyMode.setValue( true ); // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false; dirName->setNotify( true ); - frame->addChild( dirName ); + YStringWidgetID * dirID = new YStringWidgetID( idDirName->name() ); dirName->setId( dirID ); - vSplit->addChild( new NCSpacing( vSplit, YD_VERT, false, 0.6 ) ); - - split->addChild( frame ); + //new NCSpacing( vSplit, YD_VERT, false, 0.6 ); // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); - split->addChild( hSplit ); + // label for checkbox detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails->name() ); detailed->setId( detailsID ); - hSplit->addChild( new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ) ); // stretchable = true - hSplit->addChild( detailed ); + new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true // HBox for the lists NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); @@ -188,15 +187,12 @@ dirList = new NCDirectoryTable( hSplit1, opt, NCFileSelection::T_Overview, YCPString(startDir) ); YStringWidgetID * dirListID = new YStringWidgetID( idDirList->name() ); dirList->setId( dirListID ); - hSplit1->addChild( dirList ); // add the list of files fileList = new NCFileTable( hSplit1, opt, NCFileSelection::T_Overview, filter, YCPString(startDir) ); YStringWidgetID * dirFileID = new YStringWidgetID( idFileList->name() ); fileList->setId( dirFileID ); - hSplit1->addChild( fileList ); - split->addChild( hSplit1 ); opt.notifyMode.setValue( false ); opt.keyEvents.setValue( false ); @@ -213,44 +209,39 @@ // FIXME // fileName->setMaxFld( 50); - hSplit2->addChild( fileName ); // label for text field showing the filter (e.g. *.bak) NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), edit ); // editable as set in edit - hSplit2->addChild( extension ); + extension->addItem( filter, true ); // selected - split->addChild( hSplit2 ); //split->addChild( new NCSpacing( split, opt, 0.8, false, true ) ); - split->addChild( new NCSpacing( split, YD_VERT, false, 0.8 ) ); + new NCSpacing( split, YD_VERT, false, 0.8 ); // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - split->addChild( hSplit3 ); + opt.isHStretchable.setValue( true ); //hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.2, true, false ) ); - hSplit3->addChild( new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ) ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // add the OK button - opt.key_Fxx.setValue( 10 ); + opt.key_Fxx.setValue( 10 ); // FIXME // the label of the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); YStringWidgetID * okID = new YStringWidgetID(idOk->name() ); okButton->setId( okID ); - hSplit3->addChild( okButton ); - - hSplit3->addChild( new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ) ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); // add the Cancel button - opt.key_Fxx.setValue( 9 ); + opt.key_Fxx.setValue( 9 ); // FIXME // the label of the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); - YStringWidgetID * cancelID = new YStringWidgetID( idCancel->name() ); + YStringWidgetID * cancelID = new YStringWidgetID( idCancel->name() ); cancelButton->setId( cancelID ); - hSplit3->addChild( cancelButton ); - hSplit3->addChild( new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ) ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); } @@ -377,7 +368,7 @@ i, true ); #endif - //FIXME ??? + //FIXME ??? - what about 'i' // show the currently selected directory dirName->addItem( postevent.result->asString()->toString(), true ); -- 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] r39886 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_source.ycp src/modules/ src/modules/PackageCallbacks.ycp src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: lslezak Date: Thu Aug 2 11:24:36 2007 New Revision: 39886 URL: http://svn.opensuse.org/viewcvs/yast?rev=39886&view=rev Log: - inst_source - download metadata for CD/DVD repositories immedately, the medium can be changed later and accidentaly a different repository can registered - improved download progress callback handlers (#292629) - fixed "tick" callback progress Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_source.ycp trunk/packager/src/modules/ (props changed) trunk/packager/src/modules/PackageCallbacks.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.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Aug 2 11:24:36 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Aug 2 11:08:37 CEST 2007 - lslezak(a)suse.cz + +- inst_source - download metadata for CD/DVD repositories + immedately, the medium can be changed later and accidentaly + a different repository can registered +- improved download progress callback handlers (#292629) +- fixed "tick" callback progress + +------------------------------------------------------------------- Tue Jul 31 14:24:52 CEST 2007 - locilka(a)suse.cz - New location of licenses on the media - in /media.1/license/ Modified: trunk/packager/src/clients/inst_source.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_source… ============================================================================== --- trunk/packager/src/clients/inst_source.ycp (original) +++ trunk/packager/src/clients/inst_source.ycp Thu Aug 2 11:24:36 2007 @@ -301,9 +301,18 @@ repo_prop["type"] = repo_type; integer new_repo_id = Pkg::RepositoryAdd(repo_prop); - y2internal("New repository: %1: %2", new_repo_id, repo_prop); + y2milestone("Added repository: %1: %2", new_repo_id, repo_prop); newSources = add(newSources, new_repo_id); + + if (contains(["cd", "dvd"], tolower(URL::Parse(url)["scheme"]:""))) + { + // for CD/DVD repo download the metadata immediately, + // the medium is in the drive right now, it can be changed later + // and accidentaly added a different repository + y2milestone("Adding a CD or DVD repository, refreshing now..."); + Pkg::SourceRefreshNow(new_repo_id); + } } ); Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCall… ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Thu Aug 2 11:24:36 2007 @@ -804,6 +804,7 @@ w = URL::FormatURL(parsed, max_len); } // is it a file name? + else { if (substring(w, 0, 1) == "/") { @@ -1503,42 +1504,85 @@ } + global boolean IsDownloadProgressPopup() + { + return (!Mode::commandline()) && + UI::WidgetExists(`id(`download_progress_popup_window)) && + UI::WidgetExists(`id(`progress)); + } + + global void CloseDownloadProgressPopup() + { + if (IsDownloadProgressPopup()) + { + UI::CloseDialog(); + } + } + + global void InitDownload(string task) + { + if (!Mode::commandline()) + { + if (!IsDownloadProgressPopup()) + { + // heading of popup + string heading = _("Downloading"); + + UI::OpenDialog (`opt(`decorated), + `VBox (`Heading (`id(`download_progress_popup_window), heading) , + `VBox ( + `HSpacing(60), + `HBox( + `HSpacing(1), + `ProgressBar (`id(`progress), + task, 100), + `HSpacing(1) + ), + `VSpacing(0.5), + `HBox ( + `HStretch (), + `PushButton (`id (`abort), Label::AbortButton ()), + `HStretch () + ), + `VSpacing(0.5) + ) + ) + ); + } + + UI::ChangeWidget (`id(`progress), `Value, 0); + } + } + + global void DestDownload() + { + CloseDownloadProgressPopup(); + } + global void StartDownload (string url, string localfile) { + y2milestone("Downloading %1 to %2", url, localfile); + // heading of popup - string heading = _("Download"); + string heading = _("Downloading"); + + // reformat the URL + string url_report = URL::FormatURL(URL::Parse(url), max_size); // message in a progress popup - string message = sformat (_("Downloading: %1"), url); + string message = sformat (_("Downloading: %1"), url_report); if (Mode::commandline()) { CommandLine::PrintVerbose(message); } else { - UI::OpenDialog (`opt(`decorated), - `VBox (`Heading (heading) , - `VBox ( - `Label(message), - `HSpacing(60), - `HBox( - `HSpacing(2), - `ProgressBar (`id(`progress), - _("Status"), 100), - `HSpacing(2) - ), - `VSpacing(1), - `HBox ( - `HStretch (), - `PushButton (`id (`abort), Label::AbortButton ()), - `HStretch () - ), - `VSpacing(1) - ) - ) - ); - - UI::ChangeWidget (`id(`progress), `Value, 0); + if (IsDownloadProgressPopup()) + { + // change the label + UI::ChangeWidget(`id(`progress), `Label, message); + UI::ChangeWidget (`id(`progress), `Value, 0); + } } } @@ -1579,16 +1623,16 @@ %1"), error_text)); } } - - UI::CloseDialog (); } global void SetDownloadCallbacks () { + Pkg::CallbackInitDownload ("PackageCallbacks::InitDownload"); Pkg::CallbackStartDownload ("PackageCallbacks::StartDownload"); Pkg::CallbackProgressDownload ("PackageCallbacks::ProgressDownload"); Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); + Pkg::CallbackDestDownload ("PackageCallbacks::DestDownload"); } global void ClearDownloadCallbacks () @@ -2037,12 +2081,21 @@ } UI::OpenDialog( - `VBox( - `HSpacing(`id(`callback_progress_popup), max_size), - (in_percent) ? `ProgressBar (`id (`progress_widget), task, 100, val_percent) - : `Label(`id(`progress_widget), sformat("%1: %2", task, (tick_progress) ? tick_labels[current_tick]:"/" : val_raw)), - `VSpacing(0.5), - `PushButton (`id (`abort), Label::AbortButton ()) + `HBox( + `HSpacing(1), + `VBox( + `VSpacing(0.5), + `HSpacing(`id(`callback_progress_popup), max_size), + (in_percent) ? `ProgressBar (`id (`progress_widget), task, 100, val_percent) + : `VBox( + `Label(task), + `Label(`id(`progress_widget), (tick_progress) ? tick_labels[current_tick]:"/" : val_raw) + ), + `VSpacing(0.5), + `PushButton (`id (`abort), Label::AbortButton ()), + `VSpacing(0.5) + ), + `HSpacing(1) ) ); Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Thu Aug 2 11:24:36 2007 @@ -244,10 +244,12 @@ "init" : RepoNameInit, "store" : RepoNameStore, "validate_type" : `function, + // TODO FIXME: RepoName can be empty if the URL has been changed, + // yast will use the product name or the URL in this case (the repository is recreated) "validate_function" : RepoNameValidate, // help text "help" : _("<big>Repository Name</big> -Use Repository Name to specify the name of the repository.") +Use Repository Name to specify the name of the repository. If it is empty Yast will use the product name (if available) or the URL as the 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] r39885 - /branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc
by gs＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: gs Date: Thu Aug 2 11:00:20 2007 New Revision: 39885 URL: http://svn.opensuse.org/viewcvs/yast?rev=39885&view=rev Log: add createTree() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Thu Aug 2 11:00:20 2007 @@ -156,7 +156,10 @@ NCTree * NCWidgetFactory::createTree( YWidget * parent, const string & label ) { - return 0; // FIXME: TO DO + NCTree * tree = new NCTree( parent, label ); + YUI_CHECK_NEW( tree ); + + return tree; } -- 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] r39884 - in /trunk/live-installer: package/yast2-live-installer.changes src/control/live-install.xml src/inst_live_doit.ycp
by jsrain＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsrain Date: Thu Aug 2 10:53:57 2007 New Revision: 39884 URL: http://svn.opensuse.org/viewcvs/yast?rev=39884&view=rev Log: report progress while copying to the system reduced the steps Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/control/live-install.xml trunk/live-installer/src/inst_live_doit.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Aug 2 10:53:57 2007 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Aug 1 13:58:19 CEST 2007 - jsrain(a)suse.cz +Thu Aug 2 10:53:01 CEST 2007 - jsrain(a)suse.cz - even more simplified installation overview +- report progress while copying to the system +- reduced the steps ------------------------------------------------------------------- Mon Jul 30 17:27:29 CEST 2007 - jsrain(a)suse.cz Modified: trunk/live-installer/src/control/live-install.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/control/live-… ============================================================================== --- trunk/live-installer/src/control/live-install.xml (original) +++ trunk/live-installer/src/control/live-install.xml Thu Aug 2 10:53:57 2007 @@ -203,10 +203,6 @@ </module> <module> <label>Online Update</label> - <name>inst_ask_net_test</name> - </module> - <module> - <label>Online Update</label> <name>inst_do_net_test</name> </module>  - <module> - <label>Clean Up</label> - <name>suseconfig</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> <module> <name>congratulate</name> <enable_back>yes</enable_back> Modified: trunk/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_doi… ============================================================================== --- trunk/live-installer/src/inst_live_doit.ycp (original) +++ trunk/live-installer/src/inst_live_doit.ycp Thu Aug 2 10:53:57 2007 @@ -18,30 +18,69 @@ * @param to string target directory * @return boolean true on success */ -boolean FileSystemCopy (string from, string to) { -/* string fromdir = "/"; - list<string> components = splitstring (from, "/"); - if (size (components) > 1) +boolean FileSystemCopy (string from, string to, + integer progress_start, + integer progress_finish) +{ + string cmd = sformat ("du -x -B 1048576 -s %1", from); + y2milestone ("Executing %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("Output: %1", out); + string total_str = out["stdout"]:""; + integer total_mb = tointeger (total_str); + if (total_mb == 0) + total_mb = 1024*1024*1024; // should be big enough + + string tmp_pipe = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo"; + // FIXME this does not copy pipes in filesystem (usually not an issue) + cmd = sformat ( + "mkfifo %3 ; tar -C %1 -cSf - --one-file-system . | dd bs=1048576 of=%3 & echo $! >&2 ; tar -C %2 -xSf %3", + from, to, tmp_pipe); + y2milestone ("Executing %1", cmd); + SCR::Execute(.background.run_output_err, cmd); + string pid = ""; + while((boolean)SCR::Read(.background.output_open_err) || (boolean)(SCR::Read(.background.newlines_err) > 0)) { - from = components[size(components) - 1]:""; - components[size(components) - 1] = ""; - fromdir = mergestring (components, "/"); + string done = nil; + if ((integer)SCR::Read (.background.newlines_err) > 0) + { + list<string> lines = (list<string>)SCR::Read (.background.newerr); + while (pid == "" && size (lines) > 0) + { + pid = lines[0]:""; + lines[0] = nil; + lines = filter (string l, lines, { return l != nil; }); + if (! regexpmatch (pid, "^[0-9]+$")) + pid = ""; + else + y2milestone ("DD's pid: %1", pid); + } + foreach (string l, lines, { +y2internal ("Line: %1", l); + if (regexpmatch (l, "^[0-9]+ ")) + done = regexpsub (l, "^([0-9]+) ", "\\1"); + }); + y2internal ("Done: %1", done); + } + if (pid != "") + { + SCR::Execute (.target.bash, sformat ("/bin/kill -USR1 %1", pid)); + } + sleep (100); + if (done != nil) + { + integer progress = progress_start + (progress_finish - progress_start) * tointeger (done) / total_mb / 1024 / 1024; + Progress::Step (progress); + y2milestone ("Setting progress to %1", progress); + } } - if (fromdir == "") - fromdir = "/"; - if (from == "") - from = "/"; - if (to == "") - to = "/"; - y2milestone ("FromDir: %1, From: %2, To: %3", - fromdir, from, to); - string cmd = sformat ( - "(cd %1 ; tar clf - %2 ) | dd | (cd %3 ; tar -xf - )", - fromdir, from, to);*/ - string cmd = sformat ("/bin/cp -avx %1 %2", from, to); + y2milestone ("Result: %1", SCR::Read (.background.status)); + SCR::Execute (.target.remove, tmp_pipe); + cmd = sformat ("chown --reference=%1 %2; chmod --reference=%1 %2", + from, to); y2milestone ("Executing %1", cmd); - map out = (map)SCR::Execute (.target.bash_output, cmd); -// y2milestone ("Result: %1", out); + out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("Result: %1", out); return out["exit"]:-1 == 0; } @@ -93,8 +132,9 @@ * @param symlinks a map of resolved symlinks * @return boolean true on success */ -boolean CopySymlinkedImage (map<string,string> symlinks) { +boolean CopySymlinkedImage (map<string,string> symlinks, integer progress_start) { integer index = 0; + integer progress_step = (100-progress_start) * index / size (symlinks); foreach (string link, string target, symlinks, { index = index + 1; Progress::Title (sformat (_("Copying %1..."), link)); @@ -110,8 +150,10 @@ components[size(components) - 1] = ""; link = mergestring (components, "/"); */ - FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link)); - Progress::Step (10 + (90 * index / size (symlinks))); + integer progress_done = progress_start + progress_step; + FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done); + progress_start = progress_done; + Progress::Step (progress_start); }); return true; } @@ -120,10 +162,10 @@ * Copy root image to hard disk * @return boolean true on success */ -boolean CopyRootImage () { +boolean CopyRootImage (integer progress_start, integer progress_finish) { string tmpdir = (string)SCR::Read (.target.tmpdir); SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", Installation::destdir, tmpdir)); - FileSystemCopy ("/", Installation::destdir); + FileSystemCopy ("/", Installation::destdir, progress_start, progress_finish); SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir, Installation::destdir)); return true; } @@ -133,7 +175,7 @@ _("Copying the Live Image to Hard Disk"), "", // Initial progress bar label - not empty (reserve space!) 100, - [ _("Copy root filesystem"), _("Evaluate additional filesystems"), _("Copy additional filesystems") ], + [ _("Evaluate filesystems to copy"), _("Copy root filesystem"), _("Copy additional filesystems") ], [], ""); @@ -141,13 +183,17 @@ Wizard::DisableNextButton (); Progress::NextStage (); -Progress::Title (_("Copying root filesystem...")); -CopyRootImage (); -Progress::NextStageStep (5); -Progress::Title (_("Evaluating additional filesystems...")); +Progress::Title (_("Evaluating filesystems to copy...")); map<string,string> copy_map = LinksMap (LinksToCopyList ()); +Progress::NextStageStep (5); +Progress::Title (_("Copying root filesystem...")); + +integer steps = size (copy_map) + 1; +integer step_size = 95 / steps; + +CopyRootImage (5, 5 + step_size); Progress::NextStageStep (10); -CopySymlinkedImage (copy_map); +CopySymlinkedImage (copy_map, 5 + step_size); Progress::Finish(); Progress::Title (_("Finished.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0