Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at 2011-10-24 13:59:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-openSUSE (Old) and /work/SRC/openSUSE:Factory/.patterns-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-openSUSE", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-openSUSE/patterns-openSUSE.changes 2011-10-18 14:34:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-openSUSE.new/patterns-openSUSE.changes 2011-10-24 14:00:12.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Oct 21 12:12:05 UTC 2011 - [email protected] + +- Stephan Kulow (1): + remove xstroke from laptop pattern, it's fine in tabletpc only + +Vincent Untz (1): + gnome: Move simple-scan from GNOME-IMAGE-OPT to GNOME-IMAGE + +Commit: d4b44eba + +------------------------------------------------------------------- +Fri Oct 21 08:45:36 UTC 2011 - [email protected] + +- Ludwig Nussel (3): + better warning if pattern lacks 'sel' + minimal: suppress python and yast2-branding + make test runner more generic + +Commit: 98a3c6ca + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.CjZfCa/_old 2011-10-24 14:00:15.000000000 +0200 +++ /var/tmp/diff_new_pack.CjZfCa/_new 2011-10-24 14:00:15.000000000 +0200 @@ -1067,6 +1067,7 @@ Recommends: eog Recommends: patterns-openSUSE-gnome_imaging_opt Recommends: shotwell +Recommends: simple-scan Requires: patterns-openSUSE-gnome_basis Requires: patterns-openSUSE-gnome_imaging Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-imaging) @@ -1078,7 +1079,6 @@ Group: Metapackages Summary: Meta package for pattern gnome_imaging_opt Recommends: inkscape -Recommends: simple-scan Requires: patterns-openSUSE-gnome_basis Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-imaging) @@ -1558,13 +1558,10 @@ Group: Metapackages Summary: Meta package for pattern laptop Recommends: crda -Recommends: irda Recommends: iw Recommends: pcmciautils Recommends: wireless-regdb Recommends: wpa_supplicant -Recommends: xorg-x11-driver-input -Recommends: xstroke Recommends: xvkbd Requires: patterns-openSUSE-basesystem Requires: patterns-openSUSE-laptop @@ -1760,10 +1757,11 @@ Conflicts: libproxy1-config-gnome3 Conflicts: netpbm Conflicts: perl-doc +Conflicts: python Conflicts: readline-doc Conflicts: samba-client Conflicts: vim-data -Conflicts: yast2-branding-openSUSE +Conflicts: yast2-branding Conflicts: zypper-log Requires: patterns-openSUSE-minimal_base Requires: patterns-openSUSE-minimal_base-conflicts @@ -1958,9 +1956,6 @@ Recommends: cellwriter Recommends: wacom-kmp Recommends: xorg-x11-driver-input -%ifarch ix86 -Recommends: xorg-x11-driver-input -%endif Recommends: xournal Recommends: xstroke Recommends: xvkbd @@ -2124,7 +2119,6 @@ Summary: Meta package for pattern x11_opt Recommends: freeglut Recommends: xdmbgrd -Recommends: xorg-x11-driver-input Recommends: xtermset Requires: patterns-openSUSE-basesystem Requires: patterns-openSUSE-enhanced_base ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/convert_to_repomd new/patterns-openSUSE-data/convert_to_repomd --- old/patterns-openSUSE-data/convert_to_repomd 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/convert_to_repomd 2011-10-21 14:11:40.000000000 +0200 @@ -140,7 +140,10 @@ for my $f (keys %toinstall) { for my $tag (qw/category icon order role sel visible/) { my $fn = "toinstall/$f/$tag"; - next unless -r $fn; + unless (-r $fn) { + warn "$f lacks tag '$tag'"; + next; + } $toinstall{$f}->{$tag} = slurp($fn); } for my $tag (qw/conflicts extends freshens obsoletes provides recommends requires supplements/) { @@ -232,6 +235,7 @@ $deps{$tag} = $dep; } + $toinstall{$f}->{'sel'} = [] unless exists $toinstall{$f}->{'sel'}; $toinstall{$f}->{'sel'} = [ $toinstall{$f}->{'sel'} ] unless ref $toinstall{$f}->{'sel'} eq 'ARRAY'; for my $n (@{$toinstall{$f}->{'sel'}}) { if (!exists $sel{$n}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-IMAGE new/patterns-openSUSE-data/data/GNOME-IMAGE --- old/patterns-openSUSE-data/data/GNOME-IMAGE 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-IMAGE 2011-10-21 14:11:40.000000000 +0200 @@ -11,6 +11,7 @@ // Packages that really make sense // shotwell +simple-scan -Prc: +Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-IMAGE-OPT new/patterns-openSUSE-data/data/GNOME-IMAGE-OPT --- old/patterns-openSUSE-data/data/GNOME-IMAGE-OPT 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-IMAGE-OPT 2011-10-21 14:11:40.000000000 +0200 @@ -1,6 +1,5 @@ +Prc: inkscape -simple-scan -Prc: +Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/LAPTOP new/patterns-openSUSE-data/data/LAPTOP --- old/patterns-openSUSE-data/data/LAPTOP 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/data/LAPTOP 2011-10-21 14:11:40.000000000 +0200 @@ -3,19 +3,16 @@ -Prq: +Prc: -irda pcmciautils wpa_supplicant -xstroke // bnc#480879 crda wireless-regdb iw xvkbd -// nowadays provides of xorg-x11-driver-input -xorg-x11-driver-input -Prc: +Psg: +irda smbios-utils-python powertop // fate#303035 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/MINIMAL-CONFLICTS new/patterns-openSUSE-data/data/MINIMAL-CONFLICTS --- old/patterns-openSUSE-data/data/MINIMAL-CONFLICTS 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/data/MINIMAL-CONFLICTS 2011-10-21 14:11:40.000000000 +0200 @@ -18,9 +18,11 @@ // required by gio-branding desktop-data-openSUSE // supplements yast2, not needed for ncurses only -yast2-branding-openSUSE +yast2-branding // supplements libgio and wget (TODO) libproxy1-config-gnome3 // requires python zypper-log +// systemd recommends dbus-1-python +python -Pcn: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/TABLETPC new/patterns-openSUSE-data/data/TABLETPC --- old/patterns-openSUSE-data/data/TABLETPC 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/data/TABLETPC 2011-10-21 14:11:40.000000000 +0200 @@ -5,7 +5,6 @@ +Prc: cellwriter xorg-x11-driver-input -xorg-x11-driver-input wacom-kmp xournal xstroke diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/X11-OPT new/patterns-openSUSE-data/data/X11-OPT --- old/patterns-openSUSE-data/data/X11-OPT 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/data/X11-OPT 2011-10-21 14:11:40.000000000 +0200 @@ -1,7 +1,6 @@ +Prc: freeglut xdmbgrd -xorg-x11-driver-input xtermset -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/t/minimal/Makefile new/patterns-openSUSE-data/t/minimal/Makefile --- old/patterns-openSUSE-data/t/minimal/Makefile 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/t/minimal/Makefile 2011-10-21 14:11:40.000000000 +0200 @@ -1,5 +1,20 @@ -test: - repo2solv.sh . > new.solv - deptestomatic -v solver-test.xml | tee log +#ARGS=--explain +ARCH=x86_64 +YAST_PACKS=grub,yast2-installation,kernel-default -.PHONY: test +all: test_minimal + +test_minimal: patterns.solv factory.solv + ./run \ + --arch $(ARCH) \ + --repo patterns \ + --repo factory \ + --packs pattern:minimal_base@patterns \ + --packs pattern:minimal_base-conflicts@patterns \ + --packs "$(YAST_PACKS)" \ + $(ARGS) + +patterns.solv: + repo2solv.sh . > patterns.solv + +.PHONY: all test1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/t/minimal/run new/patterns-openSUSE-data/t/minimal/run --- old/patterns-openSUSE-data/t/minimal/run 2011-10-18 11:52:38.000000000 +0200 +++ new/patterns-openSUSE-data/t/minimal/run 2011-10-21 14:11:40.000000000 +0200 @@ -3,27 +3,36 @@ use strict; use satsolver; -my $arch = 'x86_64'; -my @packs = qw( - pattern:minimal_base@new - pattern:minimal_base-conflicts@new - ); - -# added by yast -push @packs, qw( - grub - yast2-installation - kernel-default - ); +use Getopt::Long; +my %options; +Getopt::Long::Configure("no_ignore_case"); +GetOptions ( + \%options, + "explain", + "list", + "size", + "arch=s", + "packs=s@", + "repo=s@", +) or die "invalid arguments\n"; + +$options{'repo'} = [ split(/,/, join(',', @{$options{'repo'}})) ] if $options{'repo'}; +$options{'packs'} = [ split(/,/, join(',', @{$options{'packs'}})) ] if $options{'packs'}; +$options{'size'} = 1 unless ($options{'explain'} || $options{'list'}); + +unless ($options{'arch'}) { + my $arch = 'x86_64'; + warn "--arch not specified, assuming $arch\n"; + $options{'arch'} = $arch; +} my $pool = new satsolver::Pool; +$pool -> set_arch ($options{'arch'}); -$pool -> set_arch ($arch); -my $repo = $pool->create_repo('factory'); -$repo->add_solv ('factory.solv'); - -my $repo_new = $pool->create_repo('new'); -$repo_new->add_solv ('new.solv'); +for my $name (@{$options{'repo'}}) { + my $repo = $pool->create_repo($name); + $repo->add_solv ($name.'.solv'); +} # Create Solver my $solver = $pool->create_solver(); @@ -34,7 +43,7 @@ # Create Request my $job = $pool->create_request(); -for my $p (@packs) { +for my $p (@{$options{'packs'}}) { my ($n, $r) = split(/@/, $p, 2); $r = $pool->find_repo($r) if $r; my $pat = $pool->find($n, $r) || die "Failed to push job: $p"; @@ -44,6 +53,16 @@ # Solve the jobs $solver->solve($job); +if ($options{'explain'}) { + for my $d ($solver->decisions()) { + printf "%s %s\n", $d->op_s(), $d->solvable()->attr_values("solvable:name");; + my $ri = $d->ruleinfo($job); + if ($ri) { + printf " %s\n", $ri->string(); + } + } +} + # Problems my $pc = $solver->problems_count(); if ($pc) { @@ -77,20 +96,32 @@ $sa <=> $sb; } +sub sortbyname +{ + my $sa = $a->attr_values("solvable:name") || ""; + my $sb = $b->attr_values("solvable:name") || ""; + $sa cmp $sb; +} + # Print packages to install my @a = $solver->installs(1); -for my $solvable (sort sortbysize @a) { - my $name = $solvable->attr_values("solvable:name"); - my $arch = $solvable->attr_values("solvable:arch"); - my $size = $solvable->attr_values("solvable:installsize") || 0; - my $ver = $solvable->attr_values("solvable:evr"); - my $solv = $solvable->string(); - printf "%8d %s\n", $size, $name; +if ($options{'list'}) { + for my $solvable (sort sortbyname @a) { + my $name = $solvable->attr_values("solvable:name"); + printf "%s\n", $name; + } +} elsif ($options{'size'}) { + for my $solvable (sort sortbysize @a) { + my $name = $solvable->attr_values("solvable:name"); + my $arch = $solvable->attr_values("solvable:arch"); + my $size = $solvable->attr_values("solvable:installsize") || 0; + my $ver = $solvable->attr_values("solvable:evr"); + my $solv = $solvable->string(); + printf "%8d %s\n", $size, $name; + } } - -sub getInstallSizeKBytes { - my $repo = shift; +sub getInstallSizeKBytes($) { my $solver = shift; my $sum = 0; my @a = $solver->installs(1); @@ -101,9 +132,11 @@ return $sum; } -# get install size -my $size = getInstallSizeKBytes($repo,$solver); -printf "%8d %s\n", $size, "TOTAL"; +if ($options{'size'}) { + # get install size + my $size = getInstallSizeKBytes($solver); + printf "%8d %s\n", $size, "TOTAL"; +} # my $transaction = $solver->transaction(); # my $sizechange = $transaction->sizechange(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
