October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52374 - /trunk/storage/storage/src/proposal/partitions_proposal.ycp
by kmachalkova＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: kmachalkova Date: Mon Oct 20 19:55:46 2008 New Revision: 52374 URL: http://svn.opensuse.org/viewcvs/yast?rev=52374&view=rev Log: Use PackagesProposal to prevent resetting pkg selection in installation (#433001, #436925) Modified: trunk/storage/storage/src/proposal/partitions_proposal.ycp Modified: trunk/storage/storage/src/proposal/partitions_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/proposal/par… ============================================================================== --- trunk/storage/storage/src/proposal/partitions_proposal.ycp (original) +++ trunk/storage/storage/src/proposal/partitions_proposal.ycp Mon Oct 20 19:55:46 2008 @@ -13,6 +13,7 @@ textdomain "storage"; import "Arch"; + import "PackagesProposal"; include "wizard/sequencer.ycp"; include "partitioning/partition_defines.ycp"; @@ -24,12 +25,17 @@ define void HandlePackages() ``{ - Pkg::DoRemove( ["lvm2"] ); - list<string> pack = Storage::AddPackageList(); - if( size(pack)>0 ) - { - Pkg::DoProvide( pack ); - } + //Use PackagesProposal to ensure that package selection + //does not get reset by this module (#433001) + string proposal_ID = "partitions_proposal"; + PackagesProposal::RemoveResolvables( proposal_ID, `package, ["lvm2"] ); + + list<string> pkgs = Storage::AddPackageList(); + //Set rather than Add, there might be some packs left over + //from previous 'MakeProposal' we don't need now + //This also covers the case when AddPackagesList returns [] or nil + PackagesProposal::SetResolvables( proposal_ID, `package, pkgs ); + if( Stage::initial() ) { Storage::SaveUsedFs(); -- 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] r52373 - /tags/stable-2_17_42/network/
by mzugec＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: mzugec Date: Mon Oct 20 18:13:34 2008 New Revision: 52373 URL: http://svn.opensuse.org/viewcvs/yast?rev=52373&view=rev Log: Created tag stable-2_17_42 for network Added: tags/stable-2_17_42/network/ - copied from r52372, trunk/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] r52372 - /tags/stable-2_17_42/
by mzugec＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: mzugec Date: Mon Oct 20 18:13:28 2008 New Revision: 52372 URL: http://svn.opensuse.org/viewcvs/yast?rev=52372&view=rev Log: Created tag stable-2_17_42 Added: tags/stable-2_17_42/ -- 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] r52371 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: mzugec Date: Mon Oct 20 18:13:16 2008 New Revision: 52371 URL: http://svn.opensuse.org/viewcvs/yast?rev=52371&view=rev Log: installation via p-t-p devices (bnc#436956) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=52371&r1=523… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Oct 20 18:13:16 2008 @@ -1 +1 @@ -2.17.41 +2.17.42 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Oct 20 18:13:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 20 18:12:05 CEST 2008 - mzugec(a)suse.de + +- installation via p-t-p devices (bnc#436956) +- 2.17.42 + +------------------------------------------------------------------- Wed Oct 15 11:48:46 CEST 2008 - ug(a)suse.de - rnc file fixed Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Oct 20 18:13:16 2008 @@ -316,6 +316,11 @@ y2milestone("Writing route : %1", InstallInf["gateway"]:""); SCR::Write(.target.string, "/etc/sysconfig/network/routes", sformat("default %1 - -\n", InstallInf["gateway"]:"")); } + else if(size(InstallInf["remote_ip"]:"")>0){ + y2milestone("Writing Peer-to-Peer route: %1", InstallInf["remote_ip"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", + sformat("default %1 - -\n", InstallInf["remote_ip"]:"")); + } else y2warning("No routing information in install.inf"); -- 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] r52370 - in /branches/SuSE-Linux-10_3-Branch/backup: VERSION package/yast2-backup.changes src/scripts/backup_search.pl
by locilka＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: locilka Date: Mon Oct 20 16:26:05 2008 New Revision: 52370 URL: http://svn.opensuse.org/viewcvs/yast?rev=52370&view=rev Log: - Fixed storing the symlinks. - Correctly escaping shell commands (both bnc #421214). - 2.15.7 Modified: branches/SuSE-Linux-10_3-Branch/backup/VERSION branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl Modified: branches/SuSE-Linux-10_3-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/backup/VERSION Mon Oct 20 16:26:05 2008 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes Mon Oct 20 16:26:05 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 20 16:22:38 CEST 2008 - locilka(a)suse.cz + +- Fixed storing the symlinks. +- Correctly escaping shell commands (both bnc #421214). +- 2.15.7 + +------------------------------------------------------------------- Fri Dec 14 18:40:12 CET 2007 - locilka(a)suse.cz - Fixed running the backup in a 'cron' mode. UI named 'testsuite' Modified: branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl (original) +++ branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl Mon Oct 20 16:26:05 2008 @@ -219,6 +219,20 @@ my %package_files_inodes; my %dups; +# bnc #421214 +sub Quote ($) { + my $string = shift; + + if (not defined $string || $string eq "") { + return ''; + }; + + $string =~ s/\'/\'"\'"\'/g; + $string = '\''.$string.'\''; + + return $string; +} + # read list of all package's files if searching not owned files is required # or MD5 sum is not used in searching modified files if ($search_files or $no_md5) @@ -259,7 +273,7 @@ # TODO: this approach is not 100% reliable - a device can mounted after this check if ($same_fs) { - open(MOUNT, "/bin/mount |"); + open(MOUNT, "-|", "LC_ALL=C /bin/mount"); while (my $line = <MOUNT>) { @@ -319,7 +333,7 @@ sub ReadAllPackages() { # read all installed packages - open(RPMQA, "rpm -qa |") + open(RPMQA, "-|", "LC_ALL=C rpm -qa") or die "Command 'rpm -qa' failed\n"; print "Reading installed packages\n"; @@ -473,7 +487,7 @@ # check if Mtime changed file is in more than one package if ($mtime and !$size and $no_md5 and $$$refref_duplicates_file{$file}) { - open(RPMQFILE, "rpm -qf $file |"); + open(RPMQFILE, "-|", "LC_ALL=C rpm -qf ".Quote ($file)); my @packages_list = (); while (my $pkg = <RPMQFILE>) @@ -493,7 +507,7 @@ # so all files in package are verified # in this verification is not MD5 test excluded # TODO LATER: don't grep but cache results of all files from package - open(RPMVRF, "rpm -V $pack --nodeps | grep $file |"); + open(RPMVRF, "-|", "LC_ALL=C rpm -V ".Quote ($pack)." --nodeps | grep ".Quote ($file)); my $fl = <RPMVRF>; @@ -534,7 +548,7 @@ sub PrintOutInstPrefix ($) { my $package = shift; - my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.$package; + my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.Quote ($package); print "Installed: ".`$rpm_query`."\n"; } @@ -546,13 +560,14 @@ ### Printing out all unavailable packages and their content if (keys %{$unavail}) { - open(RPML, - 'LC_ALL=C '. - 'rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '. - join(' ', (keys %{$unavail})). - ' |' - ) || do { - warn "Cannot run: ".'rpm -q --filesbypkg '.join(' ', (keys %{$unavail})).' |'; + my $command = ""; + foreach my $pack (keys %{$unavail}) { + $command .= ' '.Quote ($pack); + } + + $command = 'LC_ALL=C rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '.$command; + open(RPML, "-|", $command) || do { + warn "Cannot run: ".$command; }; my $current_package_name = ''; while (my $l = <RPML>) { @@ -593,7 +608,7 @@ } # verification of the package - do not check package dependencies - open(RPMV, "LC_ALL=C rpm -V $package $md5_param --nodeps |") + open(RPMV, "-|", "LC_ALL=C rpm -V ".Quote ($package)." $md5_param --nodeps") or die "Verification of package $package failed."; while (my $line = <RPMV>) { @@ -615,7 +630,7 @@ my ($all_files, $pkg_inodes) = @_; my %duplicates; - open(RPMQAL, "rpm -qal |") + open(RPMQAL, "-|", "LC_ALL=C rpm -qal") or die "Command 'rpm -qal' failed\n"; if ($output_progress) @@ -661,12 +676,15 @@ { my ($filename) = @_; - open(RPMQFILE, 'rpm -qf '.$filename.' 2>/dev/null |'); + open(RPMQFILE, '-|', 'LANG=C rpm -qf '.Quote ($filename).' 2>/dev/null'); my $inpackage = 0; while (my $pkg = <RPMQFILE>) { - $inpackage = 1; + # bnc #421214, backup also symbolic links + if ( $pkg !~ /is not owned by any package$/ ) { + $inpackage = 1; + } } close(RPMQFILE); @@ -782,7 +800,7 @@ foreach my $fsys (@fs) { - open(MOUNTT, "export LC_ALL=C; mount -t $fsys |") + open(MOUNTT, "-|", "export LC_ALL=C; mount -t ".Quote ($fsys)) or next; while ($line = <MOUNTT>) -- 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] r52369 - in /branches/SuSE-Linux-11_0-Branch/backup: VERSION package/yast2-backup.changes src/scripts/backup_search.pl
by locilka＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: locilka Date: Mon Oct 20 16:17:08 2008 New Revision: 52369 URL: http://svn.opensuse.org/viewcvs/yast?rev=52369&view=rev Log: - Fixed storing the symlinks. - Correctly escaping shell commands (both bnc #421214). - 2.16.6 Modified: branches/SuSE-Linux-11_0-Branch/backup/VERSION branches/SuSE-Linux-11_0-Branch/backup/package/yast2-backup.changes branches/SuSE-Linux-11_0-Branch/backup/src/scripts/backup_search.pl Modified: branches/SuSE-Linux-11_0-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/backup… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/backup/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/backup/VERSION Mon Oct 20 16:17:08 2008 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: branches/SuSE-Linux-11_0-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/backup… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Linux-11_0-Branch/backup/package/yast2-backup.changes Mon Oct 20 16:17:08 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 20 16:13:27 CEST 2008 - locilka(a)suse.cz + +- Fixed storing the symlinks. +- Correctly escaping shell commands (both bnc #421214). +- 2.16.6 + +------------------------------------------------------------------- Mon May 19 09:43:11 CEST 2008 - locilka(a)suse.cz - Replacing Wizard::SetFocusToNextButton with UI::SetFocus which Modified: branches/SuSE-Linux-11_0-Branch/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/backup… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/backup/src/scripts/backup_search.pl (original) +++ branches/SuSE-Linux-11_0-Branch/backup/src/scripts/backup_search.pl Mon Oct 20 16:17:08 2008 @@ -219,6 +219,20 @@ my %package_files_inodes; my %dups; +# bnc #421214 +sub Quote ($) { + my $string = shift; + + if (not defined $string || $string eq "") { + return ''; + }; + + $string =~ s/\'/\'"\'"\'/g; + $string = '\''.$string.'\''; + + return $string; +} + # read list of all package's files if searching not owned files is required # or MD5 sum is not used in searching modified files if ($search_files or $no_md5) @@ -259,7 +273,7 @@ # TODO: this approach is not 100% reliable - a device can mounted after this check if ($same_fs) { - open(MOUNT, "/bin/mount |"); + open(MOUNT, "-|", "LC_ALL=C /bin/mount"); while (my $line = <MOUNT>) { @@ -319,7 +333,7 @@ sub ReadAllPackages() { # read all installed packages - open(RPMQA, "rpm -qa |") + open(RPMQA, "-|", "LC_ALL=C rpm -qa") or die "Command 'rpm -qa' failed\n"; print "Reading installed packages\n"; @@ -473,7 +487,7 @@ # check if Mtime changed file is in more than one package if ($mtime and !$size and $no_md5 and $$$refref_duplicates_file{$file}) { - open(RPMQFILE, "rpm -qf $file |"); + open(RPMQFILE, "-|", "LC_ALL=C rpm -qf ".Quote ($file)); my @packages_list = (); while (my $pkg = <RPMQFILE>) @@ -493,7 +507,7 @@ # so all files in package are verified # in this verification is not MD5 test excluded # TODO LATER: don't grep but cache results of all files from package - open(RPMVRF, "rpm -V $pack --nodeps | grep $file |"); + open(RPMVRF, "-|", "LC_ALL=C rpm -V ".Quote ($pack)." --nodeps | grep ".Quote ($file)); my $fl = <RPMVRF>; @@ -534,7 +548,7 @@ sub PrintOutInstPrefix ($) { my $package = shift; - my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.$package; + my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.Quote ($package); print "Installed: ".`$rpm_query`."\n"; } @@ -546,13 +560,14 @@ ### Printing out all unavailable packages and their content if (keys %{$unavail}) { - open(RPML, - 'LC_ALL=C '. - 'rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '. - join(' ', (keys %{$unavail})). - ' |' - ) || do { - warn "Cannot run: ".'rpm -q --filesbypkg '.join(' ', (keys %{$unavail})).' |'; + my $command = ""; + foreach my $pack (keys %{$unavail}) { + $command .= ' '.Quote ($pack); + } + + $command = 'LC_ALL=C rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '.$command; + open(RPML, "-|", $command) || do { + warn "Cannot run: ".$command; }; my $current_package_name = ''; while (my $l = <RPML>) { @@ -593,7 +608,7 @@ } # verification of the package - do not check package dependencies - open(RPMV, "LC_ALL=C rpm -V $package $md5_param --nodeps |") + open(RPMV, "-|", "LC_ALL=C rpm -V ".Quote ($package)." $md5_param --nodeps") or die "Verification of package $package failed."; while (my $line = <RPMV>) { @@ -615,7 +630,7 @@ my ($all_files, $pkg_inodes) = @_; my %duplicates; - open(RPMQAL, "rpm -qal |") + open(RPMQAL, "-|", "LC_ALL=C rpm -qal") or die "Command 'rpm -qal' failed\n"; if ($output_progress) @@ -661,12 +676,15 @@ { my ($filename) = @_; - open(RPMQFILE, 'rpm -qf '.$filename.' 2>/dev/null |'); + open(RPMQFILE, '-|', 'LANG=C rpm -qf '.Quote ($filename).' 2>/dev/null'); my $inpackage = 0; while (my $pkg = <RPMQFILE>) { - $inpackage = 1; + # bnc #421214, backup also symbolic links + if ( $pkg !~ /is not owned by any package$/ ) { + $inpackage = 1; + } } close(RPMQFILE); @@ -782,7 +800,7 @@ foreach my $fsys (@fs) { - open(MOUNTT, "export LC_ALL=C; mount -t $fsys |") + open(MOUNTT, "-|", "export LC_ALL=C; mount -t ".Quote ($fsys)) or next; while ($line = <MOUNTT>) -- 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] r52368 - in /trunk/backup: VERSION package/yast2-backup.changes src/scripts/backup_search.pl
by locilka＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: locilka Date: Mon Oct 20 16:16:21 2008 New Revision: 52368 URL: http://svn.opensuse.org/viewcvs/yast?rev=52368&view=rev Log: - Fixed storing the symlinks. - Correctly escaping shell commands (both bnc #421214). - 2.17.1 Modified: trunk/backup/VERSION trunk/backup/package/yast2-backup.changes trunk/backup/src/scripts/backup_search.pl Modified: trunk/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/VERSION?rev=52368&r1=5236… ============================================================================== --- trunk/backup/VERSION (original) +++ trunk/backup/VERSION Mon Oct 20 16:16:21 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Mon Oct 20 16:16:21 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 20 16:15:52 CEST 2008 - locilka(a)suse.cz + +- Fixed storing the symlinks. +- Correctly escaping shell commands (both bnc #421214). +- 2.17.1 + +------------------------------------------------------------------- Mon Sep 8 17:51:38 CEST 2008 - locilka(a)suse.cz - Merged texts from proofread. Modified: trunk/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/scripts/backup_search… ============================================================================== --- trunk/backup/src/scripts/backup_search.pl (original) +++ trunk/backup/src/scripts/backup_search.pl Mon Oct 20 16:16:21 2008 @@ -229,6 +229,20 @@ my %package_files_inodes; my %dups; +# bnc #421214 +sub Quote ($) { + my $string = shift; + + if (not defined $string || $string eq "") { + return ''; + }; + + $string =~ s/\'/\'"\'"\'/g; + $string = '\''.$string.'\''; + + return $string; +} + # read list of all package's files if searching not owned files is required # or MD5 sum is not used in searching modified files if ($search_files or $no_md5) @@ -269,7 +283,7 @@ # TODO: this approach is not 100% reliable - a device can mounted after this check if ($same_fs) { - open(MOUNT, "/bin/mount |"); + open(MOUNT, "-|", "LC_ALL=C /bin/mount"); while (my $line = <MOUNT>) { @@ -329,7 +343,7 @@ sub ReadAllPackages() { # read all installed packages - open(RPMQA, "rpm -qa |") + open(RPMQA, "-|", "LC_ALL=C rpm -qa") or die "Command 'rpm -qa' failed\n"; print "Reading installed packages\n"; @@ -483,7 +497,7 @@ # check if Mtime changed file is in more than one package if ($mtime and !$size and $no_md5 and $$$refref_duplicates_file{$file}) { - open(RPMQFILE, "rpm -qf $file |"); + open(RPMQFILE, "-|", "LC_ALL=C rpm -qf ".Quote ($file)); my @packages_list = (); while (my $pkg = <RPMQFILE>) @@ -503,7 +517,7 @@ # so all files in package are verified # in this verification is not MD5 test excluded # TODO LATER: don't grep but cache results of all files from package - open(RPMVRF, "rpm -V $pack --nodeps | grep $file |"); + open(RPMVRF, "-|", "LC_ALL=C rpm -V ".Quote ($pack)." --nodeps | grep ".Quote ($file)); my $fl = <RPMVRF>; @@ -544,7 +558,7 @@ sub PrintOutInstPrefix ($) { my $package = shift; - my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.$package; + my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.Quote ($package); print "Installed: ".`$rpm_query`."\n"; } @@ -556,13 +570,14 @@ ### Printing out all unavailable packages and their content if (keys %{$unavail}) { - open(RPML, - 'LC_ALL=C '. - 'rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '. - join(' ', (keys %{$unavail})). - ' |' - ) || do { - warn "Cannot run: ".'rpm -q --filesbypkg '.join(' ', (keys %{$unavail})).' |'; + my $command = ""; + foreach my $pack (keys %{$unavail}) { + $command .= ' '.Quote ($pack); + } + + $command = 'LC_ALL=C rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '.$command; + open(RPML, "-|", $command) || do { + warn "Cannot run: ".$command; }; my $current_package_name = ''; while (my $l = <RPML>) { @@ -603,7 +618,7 @@ } # verification of the package - do not check package dependencies - open(RPMV, "LC_ALL=C rpm -V $package $md5_param --nodeps |") + open(RPMV, "-|", "LC_ALL=C rpm -V ".Quote ($package)." $md5_param --nodeps") or die "Verification of package $package failed."; while (my $line = <RPMV>) { @@ -625,7 +640,7 @@ my ($all_files, $pkg_inodes) = @_; my %duplicates; - open(RPMQAL, "rpm -qal |") + open(RPMQAL, "-|", "LC_ALL=C rpm -qal") or die "Command 'rpm -qal' failed\n"; if ($output_progress) @@ -671,12 +686,15 @@ { my ($filename) = @_; - open(RPMQFILE, 'rpm -qf '.$filename.' 2>/dev/null |'); + open(RPMQFILE, '-|', 'LANG=C rpm -qf '.Quote ($filename).' 2>/dev/null'); my $inpackage = 0; while (my $pkg = <RPMQFILE>) { - $inpackage = 1; + # bnc #421214, backup also symbolic links + if ( $pkg !~ /is not owned by any package$/ ) { + $inpackage = 1; + } } close(RPMQFILE); @@ -792,7 +810,7 @@ foreach my $fsys (@fs) { - open(MOUNTT, "export LC_ALL=C; mount -t $fsys |") + open(MOUNTT, "-|", "export LC_ALL=C; mount -t ".Quote ($fsys)) or next; while ($line = <MOUNTT>) -- 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] r52367 - in /trunk/packager: package/yast2-packager.changes src/modules/DefaultDesktop.ycp src/modules/Packages.ycp
by ug＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: ug Date: Mon Oct 20 15:55:59 2008 New Revision: 52367 URL: http://svn.opensuse.org/viewcvs/yast?rev=52367&view=rev Log: workaround added to get old autoyast behaviour back Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp trunk/packager/src/modules/Packages.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 Mon Oct 20 15:55:59 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 20 15:55:06 CEST 2008 - ug(a)suse.de + +- workaround added to get old autoyast behaviour back + +------------------------------------------------------------------- Mon Oct 20 14:48:52 CEST 2008 - lslezak(a)suse.cz - display support status dialog in the package selector widget Modified: trunk/packager/src/modules/DefaultDesktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesk… ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Mon Oct 20 15:55:59 2008 @@ -17,6 +17,7 @@ import "ProductControl"; import "Installation"; import "PackagesProposal"; +import "Mode"; // All desktop definitions are taken from control file // @see GetAllDesktopsMap @@ -56,7 +57,7 @@ * Initialize default desktop from control file if specified there */ global void Init () { - if (initialized == true) { + if (initialized == true || Mode::autoinst() ) { y2debug ("Already initialized"); return; } Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon Oct 20 15:55:59 2008 @@ -1668,7 +1668,7 @@ y2milestone ("Packages::Proposal: force_reset %1, reinit %2, lang '%3'", force_reset, reinit, Language::language); - if ( force_reset ) + if ( !Mode::autoinst() && force_reset ) { Kernel::ProbeKernel(); Packages::Reset ([`product]); -- 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] r52366 - /tags/stable-2_17_31/packager/
by lslezak＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: lslezak Date: Mon Oct 20 14:54:54 2008 New Revision: 52366 URL: http://svn.opensuse.org/viewcvs/yast?rev=52366&view=rev Log: Created tag stable-2_17_31 for packager Added: tags/stable-2_17_31/packager/ - copied from r52365, trunk/packager/ -- 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] r52365 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_packages.ycp
by lslezak＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: lslezak Date: Mon Oct 20 14:54:48 2008 New Revision: 52365 URL: http://svn.opensuse.org/viewcvs/yast?rev=52365&view=rev Log: - display support status dialog in the package selector widget if it's requested in the control file (bnc#435479) - 2.17.31 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=52365&r1=52… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Oct 20 14:54:48 2008 @@ -1 +1 @@ -2.17.30 +2.17.31 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 Mon Oct 20 14:54:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 20 14:48:52 CEST 2008 - lslezak(a)suse.cz + +- display support status dialog in the package selector widget + if it's requested in the control file (bnc#435479) +- 2.17.31 + +------------------------------------------------------------------- Thu Oct 16 20:01:37 CEST 2008 - mvidner(a)suse.cz - Fixed localized sorting to emulate < instead of <=, Modified: trunk/packager/src/clients/inst_packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_packag… ============================================================================== --- trunk/packager/src/clients/inst_packages.ycp (original) +++ trunk/packager/src/clients/inst_packages.ycp Mon Oct 20 14:54:48 2008 @@ -15,6 +15,17 @@ import "Wizard"; import "Label"; + boolean ReadSupportStatus() + { + // Load the control file + import "ProductControl"; + import "ProductFeatures"; + + boolean ret = ProductFeatures::GetBooleanFeature("software", "display_support_status"); + y2milestone("Feature display_support_status: %1", ret); + return true; + } + /** * Start the detailed package selection. If 'mode' is non-nil, it will be @@ -22,9 +33,9 @@ * * Returns `accept or `cancel . **/ - symbol detailedSelection( symbol mode, boolean enable_repo_mgr ) + symbol detailedSelection( symbol mode, boolean enable_repo_mgr, boolean display_support_status) { - y2milestone("Running detailed selection, mode: %1, display repo management: %2", mode, enable_repo_mgr); + y2milestone("Running detailed selection, mode: %1, display repo management: %2, display support status: %3", mode, enable_repo_mgr, display_support_status); // Open an empty dialog for immediate feedback UI::OpenDialog(`opt(`defaultsize), @@ -33,19 +44,32 @@ ) ); + term widget_options = `opt(); + + if (mode != nil) + { + widget_options = add(widget_options, mode); + } + + if (enable_repo_mgr) + { + widget_options = add(widget_options, `repoMgr); + } + + if (display_support_status) + { + widget_options = add(widget_options, `confirmUnsupported); + } + + y2milestone("Options for the package selector widget: %1", widget_options); + // This will take a while: Detailed package data are retrieved // while the package manager is initialized UI::ReplaceWidget(`rep, - mode == nil ? - (enable_repo_mgr ? - `PackageSelector(`id(`packages), `opt(`repoMgr), "") + // Note: size(`opt()) = 0 !! + size(widget_options) > 1 ? + `PackageSelector(`id(`packages), widget_options, "") : `PackageSelector(`id(`packages), "") - ) : - - (enable_repo_mgr ? - `PackageSelector(`id(`packages ), `opt(mode, `repoMgr), "") - : `PackageSelector(`id(`packages ), `opt(mode), "") - ) ); symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) ); @@ -68,7 +92,7 @@ if ( ! UI::HasSpecialWidget(`PatternSelector ) || UI::WizardCommand(`Ping() ) != true ) { - return detailedSelection( nil, !Stage::initial() ); // Fallback: detailed selection + return detailedSelection( nil, !Stage::initial(), ReadSupportStatus()); // Fallback: detailed selection } // Help text for software patterns / selections dialog @@ -123,7 +147,7 @@ if ( result == `details ) { - result = detailedSelection( nil, !Stage::initial() ); + result = detailedSelection( nil, !Stage::initial(), ReadSupportStatus()); if ( result == `cancel ) // don't get all the way out - the user might just have @@ -197,12 +221,12 @@ } else { - result = detailedSelection(mode , repo_mgr); + result = detailedSelection(mode , repo_mgr, ReadSupportStatus()); } } else { - result = detailedSelection(`searchMode, false); + result = detailedSelection(`searchMode, false, ReadSupportStatus()); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0