February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55435 - /trunk/storage/storage/src/include/custom_part_check_generated.ycp
by kmachalkova＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: kmachalkova Date: Wed Feb 11 16:54:44 2009 New Revision: 55435 URL: http://svn.opensuse.org/viewcvs/yast?rev=55435&view=rev Log: Modified questions after checks so that 'yes' means continuing in installation/configuration (bnc#458010) Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Wed Feb 11 16:54:44 2009 @@ -215,12 +215,12 @@ disk label from a disk, use the menu entry \"%1\" of the \"%2\" button. -Change your partitioning? +Really use GPT disk label? "), deletechars(_("Create New Partition Table"), "&"), deletechars(_("Expert"), "&"))); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } @@ -270,10 +270,10 @@ With the current setup, your %2 installation might not be directly bootable. -Change this? +Really use this setup? "),Partitions::BootCyl(),Product::name)); - if ( ret ) retval = `again; + if ( !ret ) retval = `again; } @@ -284,10 +284,10 @@ Your boot partition is less than 12MB. It is recommended to increase the size of /boot. -Do you want to do this? +Really keep this size of boot partition? ")); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } } @@ -309,10 +309,10 @@ (Partitions assigned to /boot will automatically be changed to type 0x41 PReP/CHRP). -Do you want to change your setup? +Really use the setup without /boot partition? ")); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } @@ -328,10 +328,10 @@ which means your %2 installation will not be directly bootable. -Change this? +Really use this setup? "), Partitions::BootCyl(),Product::name)); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } } @@ -349,10 +349,10 @@ your files below \"/boot\" are on a software RAID device. The boot loader setup sometimes fails in this configuration. -Change this? +Really use this setup? "),Product::name)); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } // iSeries has no problems with this configuration @@ -371,10 +371,10 @@ If you do not know exactly what you are doing, use a normal partition for your files below /boot. -Change this? +Really use this setup? "),Product::name)); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } @@ -391,28 +391,28 @@ If you do not know exactly what you are doing, use a normal FAT partition for your files below %1. -Change this? +Really use this setup? "), Partitions::BootMount(),Product::name)); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } if( (root_dmraid && !boot_found) || show_all_popups ) { // popup text - boolean ret = Popup::YesNo(sformat(_("Warning: With your current setup, your installation will probably encounter problems -when booting, because you have no separate %1 -partition on your RAID disk. + boolean ret = Popup::YesNo(sformat(_("Warning: With your current setup, your %2 installation will +encounter problems when booting, because you have no +separate %1 partition on your RAID disk. This will give severe problems with the normal boot setup. If you do not know exactly what you are doing, use a normal partition for your files below %1. -Change this? -"), Partitions::BootMount())); +Really use this setup? +"), Partitions::BootMount(), Product::name)); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && boot_found && gpt_boot_ia64) || @@ -420,8 +420,8 @@ { // popup text boolean ret = Popup::YesNo( ia64_gpt_text() + "\n\n" + - _("Change this?") ); - if (ret == true) retval = `again; + _("Really use this setup ?") ); + if (ret == false) retval = `again; } if ( (!swap_found && Stage::initial() && root_fs!=`nfs) || show_all_popups ) @@ -435,10 +435,10 @@ You can assign more than one swap partition, if desired. -Do you want to change this? +Really use the setup without swap partition? ")); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } @@ -466,12 +466,12 @@ // continued popup text _("If you decide to format the partition, all data on it will be lost. -Do you want to change your setup? +Really keep the partition unformatted? "); boolean ret = Popup::YesNo( message); - if (ret == true) retval = `again; + if (ret == false) retval = `again; } return retval == `next; -- 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] r55434 - in /trunk/qt-graph/src: QY2Graph.cc QY2Graph.h
by aschnell＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: aschnell Date: Wed Feb 11 16:23:12 2009 New Revision: 55434 URL: http://svn.opensuse.org/viewcvs/yast?rev=55434&view=rev Log: - save rect instead of size Modified: trunk/qt-graph/src/QY2Graph.cc trunk/qt-graph/src/QY2Graph.h Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=554… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Wed Feb 11 16:23:12 2009 @@ -111,7 +111,7 @@ QY2Graph::gToQ(const point& p, bool upside_down) const { QPointF tmp(p.x, p.y); - return upside_down ? QPointF(tmp.x(), size.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); + return upside_down ? QPointF(tmp.x(), rect.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); } @@ -119,7 +119,7 @@ QY2Graph::gToQ(const pointf& p, bool upside_down) const { QPointF tmp(p.x, p.y); - return upside_down ? QPointF(tmp.x(), size.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); + return upside_down ? QPointF(tmp.x(), rect.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); } @@ -327,9 +327,8 @@ } // don't use gToQ here since it adjusts the values - QRectF rect(GD_bb(graph).LL.x, GD_bb(graph).LL.y, GD_bb(graph).UR.x, GD_bb(graph).UR.y); + rect = QRectF(GD_bb(graph).LL.x, GD_bb(graph).LL.y, GD_bb(graph).UR.x, GD_bb(graph).UR.y); scene->setSceneRect(rect.adjusted(-5, -5, +5, +5)); - size = rect.size(); scene->setBackgroundBrush(aggetToQColor(graph, "bgcolor", Qt::white)); Modified: trunk/qt-graph/src/QY2Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.h?rev=5543… ============================================================================== --- trunk/qt-graph/src/QY2Graph.h (original) +++ trunk/qt-graph/src/QY2Graph.h Wed Feb 11 16:23:12 2009 @@ -68,7 +68,7 @@ QGraphicsScene* scene; QSignalMapper* signalMapper; - QSizeF size; + QRectF rect; QPointF gToQ(const point& p, bool upside_down = true) const; QPointF gToQ(const pointf& p, bool upside_down = true) const; -- 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] r55433 - /tags/stable-2_18_0/scanner/
by jsmeix＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsmeix Date: Wed Feb 11 16:22:40 2009 New Revision: 55433 URL: http://svn.opensuse.org/viewcvs/yast?rev=55433&view=rev Log: Created tag stable-2_18_0 for scanner Added: tags/stable-2_18_0/scanner/ - copied from r55432, trunk/scanner/ -- 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] r55432 - in /trunk/scanner: VERSION package/yast2-scanner.changes src/Scanner.ycp
by jsmeix＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsmeix Date: Wed Feb 11 16:22:31 2009 New Revision: 55432 URL: http://svn.opensuse.org/viewcvs/yast?rev=55432&view=rev Log: - V 2.18.0 - Fixed a typo in a text in Scanner.ycp (see Novell/Suse Bugzilla bnc#374628 in particular comment #18). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=55432&r1=554… ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Wed Feb 11 16:22:31 2009 @@ -1 +1 @@ -2.17.5 +2.18.0 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Wed Feb 11 16:22:31 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 16:04:35 CET 2009 - jsmeix(a)suse.de + +- V 2.18.0 +- Fixed a typo in a text in Scanner.ycp + (see Novell/Suse Bugzilla bnc#374628 in particular comment #18). + +------------------------------------------------------------------- Thu Dec 4 12:16:23 CET 2008 - jsmeix(a)suse.de - V 2.17.5 Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=5543… ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Wed Feb 11 16:22:31 2009 @@ -65,7 +65,7 @@ * not the last character in the alphabet, e.g. the Estonian alphabet ends * with ... s ... z ... t u v w ... x y (non-ASCII characters omitted here) * so that [a-z] would exclude t u v w x y in an Estonian locale. - * Therefore uppercase and lowercase characters are both explicitely listed + * Therefore uppercase and lowercase characters are both explicitly listed * to avoid any unexpected result e.g. of "tolower(uppercase_characters)". */ global string number_chars = "0123456789"; @@ -246,7 +246,7 @@ * Therefore also other USB devices with the device class 255 are reported as possible USB scanners. * Preset to true so that initially only scanners for which the USB IDs are known by SANE are shown. * It changes to false (i.e. show all USB devices with the device class 255 as possible USB scanners) - * when the user explicitely requests a "Restart Detection" in the OverviewDialog. + * when the user explicitly requests a "Restart Detection" in the OverviewDialog. * A second "Restart Detection" changes it back to true so that "Restart Detection" toggles it. * The idea behind is that the user can simply "Restart Detection" as often as he likes * until the result is o.k. for him because "Restart Detection" does not cause harm and @@ -413,7 +413,7 @@ You can use the special frontend /usr/bin/iscan for Epson scanners which is included in the iscan package. If you like to use a standard frontend like scanimage, xscanimage, xsane, or kooka, -you must explicitely install the 32-bit package version +you must explicitly install the 32-bit package version (i.e. get the package from the right media or repository). "); if( Package::Installed( package_name ) ) @@ -468,7 +468,7 @@ { y2milestone( "Failed to install required package %1.", package_name ); Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name. // Only a simple message because: - // Either the user has explicitely rejected to install the package, + // Either the user has explicitly rejected to install the package, // or this error does not happen on a normal system // (i.e. a system which is not totally broken or totally messed up). sformat( _("Failed to install required package %1."), @@ -1924,7 +1924,7 @@ // %2 will be replaced by the package name // Only a simple message because before there was a dialog // which let the user install the package so that this message is shown - // if the user has explicitely rejected to install it. + // if the user has explicitly rejected to install it. sformat( _("The driver %1 requires the package %2."), backend_name, package_name ) ); Progress::Title( // Last progress step progress bar title when the Progress was aborted: @@ -2006,7 +2006,7 @@ // Message of a Popup::Warning for scanners which should be set up with the hpoj backend. // Only a simple message because before there was a Popup::YesNo // which asked the user whether he wants to let YaST activate the ptal service - // so that this message is shown if the user has explicitely rejected to do it. + // so that this message is shown if the user has explicitly rejected to do it. // Do not change or translate "ptal", it is a service name. _("If the ptal service is not running, the scanner cannot work.") ); -- 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] r55431 - /tags/branch-Code-11-2_17_68/network/
by mzugec＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: mzugec Date: Wed Feb 11 16:16:47 2009 New Revision: 55431 URL: http://svn.opensuse.org/viewcvs/yast?rev=55431&view=rev Log: Created tag branch-Code-11-2_17_68 for network Added: tags/branch-Code-11-2_17_68/network/ - copied from r55430, branches/SuSE-Code-11-Branch/network/ -- 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] r55430 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: mzugec Date: Wed Feb 11 16:15:10 2009 New Revision: 55430 URL: http://svn.opensuse.org/viewcvs/yast?rev=55430&view=rev Log: store qeth options (bnc#474276) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Wed Feb 11 16:15:10 2009 @@ -1 +1 @@ -2.17.67 +2.17.68 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Wed Feb 11 16:15:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 11 15:33:19 CET 2009 - mzugec(a)suse.cz + +- store qeth options (bnc#474276) +- 2.17.68 + +------------------------------------------------------------------- Mon Feb 2 15:02:08 CET 2009 - kmachalkova(a)suse.cz - Read/write Host::write_hostname variable by Host module only, Modified: branches/SuSE-Code-11-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/LanItems.ycp Wed Feb 11 16:15:10 2009 @@ -1594,11 +1594,16 @@ case "qeth": case "hsi": string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; +/* if (size(chan_mode)>0) // chan_ids (read, write, control), port command1=sformat("qeth_configure %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids); else command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids); +*/ + string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : ""; + string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : ""; + command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, qeth_layer2?"-l":"", portname_param, portnumber_param, qeth_chanids); command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "ctc": -- 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] r55429 - /tags/branch-SLE-10-SP3-2_13_68/online-update/
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 16:15:01 2009 New Revision: 55429 URL: http://svn.opensuse.org/viewcvs/yast?rev=55429&view=rev Log: Created tag branch-SLE-10-SP3-2_13_68 for online-update Added: tags/branch-SLE-10-SP3-2_13_68/online-update/ - copied from r55428, branches/SuSE-SLE-10-SP3-Branch/online-update/ -- 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] r55428 - /tags/branch-SLE-10-SP3-2_13_68/
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 16:14:59 2009 New Revision: 55428 URL: http://svn.opensuse.org/viewcvs/yast?rev=55428&view=rev Log: Created tag branch-SLE-10-SP3-2_13_68 Added: tags/branch-SLE-10-SP3-2_13_68/ -- 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] r55427 - in /branches/SuSE-SLE-10-SP3-Branch/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 16:14:55 2009 New Revision: 55427 URL: http://svn.opensuse.org/viewcvs/yast?rev=55427&view=rev Log: - different progress caption for CD Update (bnc#385186) - 2.13.68 Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION Wed Feb 11 16:14:55 2009 @@ -1 +1 @@ -2.13.67 +2.13.68 Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes Wed Feb 11 16:14:55 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 11 16:01:07 CET 2009 - jsuchome(a)suse.cz + +- different progress caption for CD Update (bnc#385186) +- 2.13.68 + +------------------------------------------------------------------- Thu Apr 24 13:20:54 CEST 2008 - jsuchome(a)suse.cz - Patch CD: ensure first CD is in drive before synchronization with Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update.ycp Wed Feb 11 16:14:55 2009 @@ -88,8 +88,12 @@ _("Finished") ]; - // dialog caption - Progress::New(_("Initializing Online Update"), " ", 2, stages, steps, ""); + string caption = OnlineUpdate::cd_update ? + // dialog caption + _("Initializing CD Update") : + // dialog caption + _("Initializing Online Update"); + Progress::New (caption, " ", 2, stages, steps, ""); // check whether running as root // and having the packager for ourselves -- 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] r55426 - /trunk/devtools/devtools/bin/y2makeall
by dmacvicar＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: dmacvicar Date: Wed Feb 11 15:56:58 2009 New Revision: 55426 URL: http://svn.opensuse.org/viewcvs/yast?rev=55426&view=rev Log: merge back y2makeall we use on Hudson, with additional features like printing the base buildrequires. Stano's work 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 Wed Feb 11 15:56:58 2009 @@ -14,7 +14,7 @@ use Getopt::Long; use File::Basename; use IPC::Open2; - +use Data::Dumper; # # Configuration variables. # @@ -41,6 +41,12 @@ "packagemanager-test" ); +if ( $ENV{'Y2MAKEALL_EXCLUDE'} ) +{ + push @exclude_list, split(/ /, $ENV{'Y2MAKEALL_EXCLUDE'}); + print Dumper(@exclude_list); +} + # Personal favourites - those directories will be processed first (in this order). # This is what most YCP package maintainers will want to change in their personal # ~/.yast2/y2makeallrc file to get their personal packages processed first. @@ -56,6 +62,14 @@ "packager" ); +if ( $ENV{'Y2MAKEALL_FAVOURITES'} ) +{ + print "favoritos"; + @ycp_favourites = split(/ /, $ENV{'Y2MAKEALL_FAVOURITES'}); + Dumper(@ycp_favourites); + +} + # Dependencies (from all other YaST2 packages) that are deliberately ignored. # This is necessary to break up dependency cycles which otherwise would make # bootstrapping impossible. @@ -124,6 +138,7 @@ my %relevant_rpms; my %pkg_provides; my %pkg_requires; +my %pkg_buildrequires; my %provided_by; my %base_rpms; my @build_order; @@ -159,6 +174,7 @@ my $no_sudo = 0; my $dump_build_order = 0; my $dump_dependencies = 0; + my $dump_builddependencies = 0; my $ignore_libzypp = 0; my $build_libzypp = 0; my $enable_icecream = 0; @@ -169,6 +185,7 @@ "no-sudo" => \$no_sudo, "dump-build-order" => \$dump_build_order, "dump-dependencies" => \$dump_dependencies, + "dump-builddependencies"=> \$dump_builddependencies, "dry-run" => \$dry_run, "ignore-libzypp" => \$ignore_libzypp, "build-libzypp" => \$build_libzypp, @@ -177,6 +194,7 @@ "icecream" => \$enable_icecream, "icecream-prefix=s" => \$icecream_prefix, "jobs=i" => \$jobs, + "rcfile=s" => \$user_config_file, "verbose" => \$verbose, "debug" => \$debug, "silent" => \$silent, @@ -282,6 +300,12 @@ exit; } + if ( $dump_builddependencies ) + { + dump_builddependencies(); + exit; + } + if ( $dump_build_order ) { dump_build_order(); @@ -367,6 +391,7 @@ { read_all_dependencies(); expand_provides(); + %pkg_buildrequires = %pkg_requires; kick_irrelevant_requires(); tsort_dependencies(); } @@ -618,6 +643,26 @@ } } +#----------------------------------------------------------------------------- + +# Dump all build depencencies to stdout. + +sub dump_builddependencies() +{ + my $rpm; + + foreach $rpm ( sort( keys( %pkg_buildrequires ) ) ) + { + my $req = $pkg_buildrequires{ $rpm }; + my $this_pkg_requires; + + foreach $this_pkg_requires ( sort( keys( %$req ) ) ) + { + log_always( "$rpm", $this_pkg_requires ); + } + } +} + #----------------------------------------------------------------------------- @@ -740,6 +785,7 @@ { my $old_requires = $pkg_requires{ $pkg }; my %new_requires; + my %new_buildrequires; my $req; foreach $req ( keys %$old_requires ) @@ -758,11 +804,13 @@ else { log_debug( "Kicking irrelevant dependency \"$pkg requires $req\"" ); + $new_buildrequires{ $req } = 1; } } } $pkg_requires{ $pkg } = \%new_requires; + $pkg_buildrequires{ $pkg } = \%new_buildrequires; } } @@ -1408,6 +1456,7 @@ --dump-build-order only dump the build order to stdout and log --dump-dependencies only dump package dependencies to stdout and log + --dump-builddependencies only dump package dependencies outside of YaST to stdout and log --dry-run do not build anything, only print what would be done --ignore-libzypp do not complain if multiple versions of libzypp are installed @@ -1415,6 +1464,7 @@ --icecream-prefix <prefix> use <prefix> instead of /opt/icecream --jobs Specifies the number of jobs to run simultaneously (default 8) + --rcfile <rcfile> use alternative location for reading y2makeallrc file -v (--verbose) verbose output -d (--debug) debug output (even more verbose) -s (--silent) turn verbosity down -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0