January 2008 - openSUSE Commits - openSUSE Mailing Lists

commit patterns-openSUSE
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Thu Jan 31 23:53:02 CET 2008. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2008-01-31 11:21:52.000000000 +0100 +++ patterns-openSUSE/patterns-openSUSE.changes 2008-01-31 18:41:20.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 18:41:13 CET 2008 - coolo(a)suse.de + +- remove more non-existant packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.s13989/_old 2008-01-31 23:51:52.000000000 +0100 +++ /var/tmp/diff_new_pack.s13989/_new 2008-01-31 23:51:52.000000000 +0100 @@ -17,7 +17,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 22 +Release: 24 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -173,6 +173,8 @@ %changelog * Thu Jan 31 2008 coolo(a)suse.de +- remove more non-existant packages +* Thu Jan 31 2008 coolo(a)suse.de - removed dropped packages - replace renamed packages - move some more packages to suggests ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Java new/patterns-openSUSE-data/data/DEVEL-Java --- old/patterns-openSUSE-data/data/DEVEL-Java 2008-01-30 21:53:58.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Java 2008-01-31 18:33:34.000000000 +0100 @@ -30,6 +30,7 @@ java-1_5_0-gcj-compat-devel -Prc: +Psg: +gnu-jaf geronimo jakarta-commons-beanutils jakarta-commons-codec diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Web new/patterns-openSUSE-data/data/DEVEL-Web --- old/patterns-openSUSE-data/data/DEVEL-Web 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Web 2008-01-31 18:40:43.000000000 +0100 @@ -2,7 +2,6 @@ apache2-devel -Prc: +Psg: -bluefish html-dtd iso_ent latex2html @@ -31,7 +30,6 @@ php5-dom php5-exif php5-fastcgi -php5-filepro php5-ftp php5-gd php5-gettext @@ -69,7 +67,4 @@ tomcat6-webapps selfhtml selfphp -zope -zope3 -zope-mysql -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/FILE-SERVER new/patterns-openSUSE-data/data/FILE-SERVER --- old/patterns-openSUSE-data/data/FILE-SERVER 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/FILE-SERVER 2008-01-31 18:37:17.000000000 +0100 @@ -8,7 +8,6 @@ +Prc: vsftpd samba-client -samba-pdb samba-winbind tftp yast2-ftp-server diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Multimedia new/patterns-openSUSE-data/data/GNOME-Multimedia --- old/patterns-openSUSE-data/data/GNOME-Multimedia 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Multimedia 2008-01-31 18:36:19.000000000 +0100 @@ -7,11 +7,6 @@ opensuse-codecs-installer -Prq: -+Prc: -gstreamer-0_10-plugins-base-oil -gstreamer-0_10-plugins-base-visual --Prc: - +Psg: banshee -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/NON-OSS new/patterns-openSUSE-data/data/NON-OSS --- old/patterns-openSUSE-data/data/NON-OSS 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/NON-OSS 2008-01-31 18:37:25.000000000 +0100 @@ -36,8 +36,6 @@ planmaker qlogic-firmware sesam_srv -smartlink-softmodem -smartlink-softmodem-kmp-default textmaker ttf-founder-simplified ttf-founder-traditional diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/NON-OSS-JAVA new/patterns-openSUSE-data/data/NON-OSS-JAVA --- old/patterns-openSUSE-data/data/NON-OSS-JAVA 2008-01-30 21:53:47.000000000 +0100 +++ new/patterns-openSUSE-data/data/NON-OSS-JAVA 2008-01-31 18:33:22.000000000 +0100 @@ -7,7 +7,6 @@ +Psg: ant-antlr ant-javamail -gnu-jaf java-1_5_0-sun-alsa java-1_5_0-sun-devel java-1_5_0-sun-jdbc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD new/patterns-openSUSE-data/data/REST-DVD --- old/patterns-openSUSE-data/data/REST-DVD 2008-01-30 21:54:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-DVD 2008-01-31 18:36:53.000000000 +0100 @@ -3,7 +3,6 @@ // for yast2-scanner sane // mandatory hplip // optionally, this should be already installed by default -hp-officeJet // optionally iscan // optionally, proprietary binary-only i386-only software from Epson Kowa iscan-free // optionally, open source, derived from iscan diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD-SUGGESTS new/patterns-openSUSE-data/data/REST-DVD-SUGGESTS --- old/patterns-openSUSE-data/data/REST-DVD-SUGGESTS 2008-01-31 11:09:32.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-DVD-SUGGESTS 2008-01-31 18:37:09.000000000 +0100 @@ -27,7 +27,6 @@ autoyast2 inst-source-utils black-box -bluefish bsd-games build cpufrequtils @@ -57,8 +56,6 @@ iso_ent iwl3945-ucode iwl4965-ucode -jaf -jaf-manual jakarta-commons-beanutils jakarta-commons-codec jakarta-commons-collections @@ -81,8 +78,7 @@ jdepend jfsutils jms -jmx -jta +mx4j kcall kdebase3-devel kdebase4-workspace-devel @@ -258,7 +254,6 @@ php5-dom php5-exif php5-fastcgi -php5-filepro php5-ftp php5-gd php5-gettext @@ -385,4 +380,5 @@ yast2-multipath yast2-phone-services yast2-storage-evms +wine -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD-UNKNOWN new/patterns-openSUSE-data/data/REST-DVD-UNKNOWN --- old/patterns-openSUSE-data/data/REST-DVD-UNKNOWN 2008-01-31 11:10:13.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-DVD-UNKNOWN 2008-01-31 12:22:56.000000000 +0100 @@ -47,7 +47,6 @@ bsh2-demo bsh2-manual busybox -bzflag bzip2-doc calamaris canna-yubin @@ -208,7 +207,6 @@ img2eps imgSeek indeview -install-initrd intlfonts-ttf iptraf ipxrip @@ -243,8 +241,6 @@ kdeaddons3-kontact kdeaddons3-sound kdeadmin3 -kdeartwork3 -kdeartwork3-sound kdebase3-extra kdedesktopcheck kdeedu4 @@ -514,8 +510,6 @@ QtDMM raptor rasmol -rekall -rekall-xbase rfb rfbplaymacro rfbproxy @@ -612,7 +606,6 @@ wdfs wiggle WindowMaker-themes -wine wlan-ng wlan-ng-kmp-pae wlan-ng-kmp-xen diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/TECHNICAL-WRITING new/patterns-openSUSE-data/data/TECHNICAL-WRITING --- old/patterns-openSUSE-data/data/TECHNICAL-WRITING 2008-01-31 07:25:57.000000000 +0100 +++ new/patterns-openSUSE-data/data/TECHNICAL-WRITING 2008-01-31 18:40:11.000000000 +0100 @@ -16,19 +16,19 @@ nxml-mode sablot saxon -xmlroff +//LATER xmlroff xmlformat xmlstarlet // Packages Specific to DocBook dbsplit-tools -docbook2odf +//LATER docbook2odf docbook_5 docbook5-xsl-stylesheets docbook-xml-website -doclifter +//LATER doclifter susedoc -texi2db -wt2db +//LATER texi2db +//LATER wt2db // Text Encoding Initiative tei-xsl-stylesheets tei-roma diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/X11 new/patterns-openSUSE-data/data/X11 --- old/patterns-openSUSE-data/data/X11 2008-01-30 21:52:40.000000000 +0100 +++ new/patterns-openSUSE-data/data/X11 2008-01-31 15:53:46.000000000 +0100 @@ -33,10 +33,13 @@ freeglut // #302566 x11-tools +// #353229 - drag in empty replacements +translation-update -Prc: +Psg: // required by others icewm-lite 915resolution +wine -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/XFCE new/patterns-openSUSE-data/data/XFCE --- old/patterns-openSUSE-data/data/XFCE 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/XFCE 2008-01-31 18:40:25.000000000 +0100 @@ -14,19 +14,16 @@ notification-daemon-xfce orage Terminal -thunar-plugins xarchiver xfce-mcs-plugins xfce4-appfinder xfce4-mixer xfce4-volstatus xfprint -yast2-mcs-manager -Prc: +Psg: xfce4-dev-tools xfce4-taskmanager -xfce4-toys xfmedia xfwm4-themes xfce4-panel-plugin-battery ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum-utils
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yum-utils checked in at Thu Jan 31 23:48:44 CET 2008. -------- --- yum-utils/yum-utils.changes 2008-01-22 20:27:19.000000000 +0100 +++ yum-utils/yum-utils.changes 2008-01-31 14:11:46.373106000 +0100 @@ -1,0 +2,36 @@ +Thu Jan 31 14:23:04 CET 2008 - cthiel(a)suse.de + +- update to version 1.1.11 + * plugins/tmprepo/tmprepo.conf, plugins/tmprepo/tmprepo.py, yum-utils.spec: + Add --tmprepo as a plugin + * plugins/aliases/aliases.py: New help info. for aliases + * plugins/security/security.py: Add support for the new help + * plugins/list-data/list-data.py: Add support for the new help + * plugins/list-data/list-data.py: Fix bad import + * plugins/priorities/priorities.py: Make yum-priorities not eat CPU just by + installing it + * plugins/list-data/list-data.py: Use .committer property in HEAD + * debuginfo-install.py, repoclosure.py, repodiff.py, repomanage.py, + repotrack.py, yum-complete-transaction.py: add better usage explanations + to a lot of yum-utils. helps to give people an idea what the tool is + used for. + * plugins/list-data/list-data.conf, plugins/list-data/list-data.py, + yum-utils.spec: List vendors, groups, packagers, buildhosts, licenses, + arches, buildhosts, baseurls, package-sizes, archive-sizes, + installed-sizes, committers + * docs/package-cleanup.1: Reorder option docs to be sorted + * docs/package-cleanup.1: Remove duplicate doc + * repodiff.py: make sure this only operates on src rpms b/c otherwise bad + things happen + * repodiff.py: add -q, --new and --old options to repodiff. Correct some + logic issues in the diffing, fix up the output to a pipe + * yumdownloader.py: Remove hack for *-source repos. + * yumdownloader.py: Real fix for the __len__ problem. Don't disableRepo() + and then enable it, this even do the disable last ... oops. + * Makefile, repodiff.py, yum-utils.spec: add repodiff + * plugins/aliases/aliases.py: Workaround for bad yum module users + * plugins/security/security.py: Remove extra newlines, __str__ already + leads with one + * plugins/aliases/aliases: Remove empty lss alias and minor cleanup + +------------------------------------------------------------------- @@ -306 +341,0 @@ - Old: ---- yum-utils-1.1.10.tar.bz2 New: ---- yum-utils-1.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum-utils.spec ++++++ --- /var/tmp/diff_new_pack.Ww7101/_old 2008-01-31 23:48:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Ww7101/_new 2008-01-31 23:48:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yum-utils (Version 1.1.10) +# spec file for package yum-utils (Version 1.1.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: yum-utils BuildRequires: python-devel -Version: 1.1.10 -Release: 6 +Version: 1.1.11 +Release: 1 License: GPL v2 or later Group: System/Packages Summary: Utilities based around the yum package manager @@ -362,6 +362,39 @@ /usr/lib/yum-plugins/basearchonly.* %changelog +* Thu Jan 31 2008 cthiel(a)suse.de +- update to version 1.1.11 + * plugins/tmprepo/tmprepo.conf, plugins/tmprepo/tmprepo.py, yum-utils.spec: + Add --tmprepo as a plugin + * plugins/aliases/aliases.py: New help info. for aliases + * plugins/security/security.py: Add support for the new help + * plugins/list-data/list-data.py: Add support for the new help + * plugins/list-data/list-data.py: Fix bad import + * plugins/priorities/priorities.py: Make yum-priorities not eat CPU just by + installing it + * plugins/list-data/list-data.py: Use .committer property in HEAD + * debuginfo-install.py, repoclosure.py, repodiff.py, repomanage.py, + repotrack.py, yum-complete-transaction.py: add better usage explanations + to a lot of yum-utils. helps to give people an idea what the tool is + used for. + * plugins/list-data/list-data.conf, plugins/list-data/list-data.py, + yum-utils.spec: List vendors, groups, packagers, buildhosts, licenses, + arches, buildhosts, baseurls, package-sizes, archive-sizes, + installed-sizes, committers + * docs/package-cleanup.1: Reorder option docs to be sorted + * docs/package-cleanup.1: Remove duplicate doc + * repodiff.py: make sure this only operates on src rpms b/c otherwise bad + things happen + * repodiff.py: add -q, --new and --old options to repodiff. Correct some + logic issues in the diffing, fix up the output to a pipe + * yumdownloader.py: Remove hack for *-source repos. + * yumdownloader.py: Real fix for the __len__ problem. Don't disableRepo() + and then enable it, this even do the disable last ... oops. + * Makefile, repodiff.py, yum-utils.spec: add repodiff + * plugins/aliases/aliases.py: Workaround for bad yum module users + * plugins/security/security.py: Remove extra newlines, __str__ already + leads with one + * plugins/aliases/aliases: Remove empty lss alias and minor cleanup * Tue Jan 22 2008 cthiel(a)suse.de - fix yum.conf location to /etc/yum in various places (#350914) * Mon Jan 07 2008 cthiel(a)suse.de @@ -446,7 +479,7 @@ * package-cleanup.py: Added patch to make package-cleanup return exit code * Fixed yumdownloader --url output to show the right url (rhbz #301981) * various other fixes -* Fri Oct 05 2007 cthiel(a)suse.de +* Sat Oct 06 2007 cthiel(a)suse.de - New basearchonly plugin - New --repofrompath=repotag,<path/URL> option to specify local repos to repoquery ++++++ yum-utils-1.1.10.tar.bz2 -> yum-utils-1.1.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/ChangeLog new/yum-utils-1.1.11/ChangeLog --- old/yum-utils-1.1.10/ChangeLog 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/ChangeLog 2008-01-30 07:03:15.000000000 +0100 @@ -1,3 +1,109 @@ +2008-01-30 Tim Lauridsen <tim(a)naboo.local> + + * yum-utils.spec: bumped yum-utils version to 1.1.11 + +2008-01-28 James Antill <james(a)and.org> + + * plugins/tmprepo/tmprepo.conf, plugins/tmprepo/tmprepo.py, + yum-utils.spec: Add --tmprepo as a plugin + +2008-01-28 James Antill <james(a)and.org> + + * plugins/aliases/aliases.py: New help info. for aliases + +2008-01-25 James Antill <james(a)and.org> + + * plugins/security/security.py: Add support for the new help + +2008-01-25 James Antill <james(a)and.org> + + * plugins/list-data/list-data.py: Add support for the new help + +2008-01-25 James Antill <james(a)and.org> + + * plugins/list-data/list-data.py: Fix bad import + +2008-01-25 James Antill <james(a)and.org> + + * plugins/priorities/priorities.py: Make yum-priorities not eat CPU + just by installing it + +2008-01-23 James Antill <james(a)and.org> + + * plugins/list-data/list-data.py: Use .committer property in HEAD + yum + +2008-01-23 Seth Vidal <skvidal(a)fedoraproject.org> + + * debuginfo-install.py, repoclosure.py, repodiff.py, repomanage.py, + repotrack.py, yum-complete-transaction.py: add better usage + explanations to a lot of yum-utils. helps to give people an idea + what the tool is used for. + +2008-01-15 James Antill <james(a)and.org> + + * plugins/list-data/list-data.conf, plugins/list-data/list-data.py, + yum-utils.spec: List vendors, groups, packagers, buildhosts, licenses, arches, + buildhosts, baseurls, package-sizes, archive-sizes, + installed-sizes, committers + +2008-01-19 James Antill <james(a)and.org> + + * docs/package-cleanup.1: Reorder option docs to be sorted + +2008-01-19 James Antill <james(a)and.org> + + * docs/package-cleanup.1: Remove duplicate doc + +2008-01-18 Seth Vidal <skvidal(a)fedoraproject.org> + + * repodiff.py: make sure this only operates on src rpms b/c + otherwise bad things happen + +2008-01-18 James Antill <james(a)and.org> + + * yum-utils.spec: Fix typo + +2008-01-17 Seth Vidal <skvidal(a)fedoraproject.org> + + * repodiff.py: add -q, --new and --old options to repodiff. Correct + some logic issues in the diffing, fix up the output to a pipe + +2008-01-16 James Antill <james(a)and.org> + + * yumdownloader.py: Remove hack for *-source repos. + +2008-01-16 James Antill <james(a)and.org> + + * yumdownloader.py: Real fix for the __len__ problem. Don't disableRepo() and then + enable it, this even do the disable last ... oops. + +2008-01-13 Seth Vidal <skvidal(a)fedoraproject.org> + + add repodiff, merge yum-utils.spec + +2008-01-13 Seth Vidal <skvidal(a)fedoraproject.org> + + * Makefile, repodiff.py, yum-utils.spec: add repodiff + +2008-01-10 James Antill <james(a)and.org> + + * plugins/aliases/aliases.py: Workaround for bad yum module users + +2008-01-09 James Antill <james(a)and.org> + + * plugins/security/security.py: Remove extra newlines, __str__ + already leads with one + +2008-01-09 James Antill <james(a)and.org> + + * plugins/aliases/aliases: Remove empty lss alias and minor cleanup + + +2008-01-03 Tim Lauridsen <tla(a)rasmil.dk> + + * ChangeLog: updated ChangeLog + 2008-01-03 Tim Lauridsen <tla(a)rasmil.dk> * Makefile: bumped yum-utils version to 1.1.10 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/debuginfo-install.py new/yum-utils-1.1.11/debuginfo-install.py --- old/yum-utils-1.1.10/debuginfo-install.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/debuginfo-install.py 2008-01-30 07:03:15.000000000 +0100 @@ -28,7 +28,10 @@ class DebugInfoInstall(YumUtilBase): NAME = 'debuginfo-install' VERSION = '1.0' - USAGE = '"usage: debuginfo-install [options] package1 [package2] [package..]' + USAGE = """ + debuginfo-install: Install debuginfo packages and their dependencies based on + the name of the non-debug package + debuginfo-install [options] package1 [package2] [package..]""" def __init__(self): YumUtilBase.__init__(self, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/docs/package-cleanup.1 new/yum-utils-1.1.11/docs/package-cleanup.1 --- old/yum-utils-1.1.10/docs/package-cleanup.1 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/docs/package-cleanup.1 2008-01-30 07:03:15.000000000 +0100 @@ -9,28 +9,26 @@ \fBpackage-cleanup\fP is a program for cleaning up the locally-installed RPMs. .PP .SH "GENERAL OPTIONS" -.IP "\fB\-v, \-\-version\fP" -Report program version and exit. +.IP "\fB\-c <config file>\fP" +Use alternative config file (default is /etc/yum.conf). .IP "\fB\-h, \-\-help\fP" Help; display a help message and then quit\&. .IP "\fB\-q, \-\-quiet\fP" Print out nothing unecessary. +.IP "\fB\-v, \-\-version\fP" +Report program version and exit. .IP "\fB\-y\fP" Agree to anything asked. -.IP "\fB\-c <config file>\fP" -Use alternative config file (default is /etc/yum.conf). -.IP "\fB\-\-problems\fP" -List dependency problems in the local RPM database. .IP "\fB\-\-leaves\fP" List leaf nodes in the local RPM database. Leaf nodes are RPMs that are not relied upon by any other RPM. -.IP "\fB\-\-problems\fP" -List dependency problems in the local RPM database. .IP "\fB\-\-orphans\fP" List installed packages which are not available from currenly configured repositories. .IP "\fB\-\-oldkernels\fP" Remove old kernel and kernel-devel packages. +.IP "\fB\-\-problems\fP" +List dependency problems in the local RPM database. .PP .SH "LEAVES OPTIONS" .IP "\fB\-\-all\fP" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/Makefile new/yum-utils-1.1.11/Makefile --- old/yum-utils-1.1.10/Makefile 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/Makefile 2008-01-30 07:03:15.000000000 +0100 @@ -1,6 +1,6 @@ SUBDIRS = docs PKGNAME = yum-utils -UTILS = package-cleanup debuginfo-install repoclosure repomanage repoquery repo-graph repo-rss yumdownloader yum-builddep repotrack reposync yum-complete-transaction +UTILS = package-cleanup debuginfo-install repoclosure repomanage repoquery repo-graph repo-rss yumdownloader yum-builddep repotrack reposync yum-complete-transaction repodiff VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec) RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec) WEBHOST = login.dulug.duke.edu diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/aliases/aliases new/yum-utils-1.1.11/plugins/aliases/aliases --- old/yum-utils-1.1.10/plugins/aliases/aliases 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/aliases/aliases 2008-01-30 07:03:15.000000000 +0100 @@ -13,21 +13,22 @@ ALLSRC --enablerepo=*-source ALLDBG --enablerepo=*-debuginfo +FORCE --skip-broken --disableexcludes=all + up upgrade inst install ls list lsi ls installed lsu ls updates -lss lsec list-security -lssu SEC ls updates +lssu SEC lsu -force-install --skip-broken --disableexcludes=all install -force-inst --skip-broken --disableexcludes=all inst -force-upgrade --skip-broken --disableexcludes=all upgrade -force-up --skip-broken --disableexcludes=all up -force-update --skip-broken --disableexcludes=all update +force-install FORCE install +force-inst FORCE inst +force-upgrade FORCE upgrade +force-up FORCE up +force-update FORCE update dbg-install DBG install dbg-inst DBG inst @@ -50,8 +51,8 @@ # lsecT UPT lsec # lsecD DEV lsec # -# upT UPT update -# upD DEV update +# upT UPT up +# upD DEV up # -# instT UPT install -# instD DEV install +# instT UPT inst +# instD DEV inst diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/aliases/aliases.py new/yum-utils-1.1.11/plugins/aliases/aliases.py --- old/yum-utils-1.1.10/plugins/aliases/aliases.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/aliases/aliases.py 2008-01-30 07:03:15.000000000 +0100 @@ -24,7 +24,11 @@ except: class CliError: # Never used by yumex pass -from i18n import _ + +try: # $rand yum using python code don't have i18n + from i18n import _ +except: + def _(x): return x requires_api_version = '2.1' plugin_type = (TYPE_INTERACTIVE,) @@ -37,7 +41,10 @@ return [self.cmd] def getUsage(self): - return self.getNames()[0] + return '' + + def getSummary(self): + return '' # doCheck and doCommand are never called, for aliased commands. @@ -85,6 +92,12 @@ def __init__(self): AliasedCommand.__init__(self, "alias") + def getUsage(self): + return "[ALIAS] [expansion]" + + def getSummary(self): + return "Adds or lists aliases" + def doCheck(self, base, basecmd, extcmds): if len(extcmds) > 1: # Add a new alias try: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/list-data/list-data.conf new/yum-utils-1.1.11/plugins/list-data/list-data.conf --- old/yum-utils-1.1.10/plugins/list-data/list-data.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/list-data/list-data.conf 2008-01-30 07:03:15.000000000 +0100 @@ -0,0 +1,2 @@ +[main] +enabled=1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/list-data/list-data.py new/yum-utils-1.1.11/plugins/list-data/list-data.py --- old/yum-utils-1.1.10/plugins/list-data/list-data.py 1970-01-01 01:00:00.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/list-data/list-data.py 2008-01-30 07:03:15.000000000 +0100 @@ -0,0 +1,232 @@ +#! /usr/bin/python -tt +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# +# Copyright Red Hat Inc. 2007, 2008 +# +# Author: James Antill <james.antill(a)redhat.com> +# +# Examples: +# +# yum list-vendors +# yum list-packagers yum* +# yum list-groups updates + + +import yum +import types +from yum.plugins import TYPE_INTERACTIVE +import logging # for commands +from yum import logginglevels + +# For baseurl +import urlparse + +# Decent (UK/US English only) number formatting. +import locale +locale.setlocale(locale.LC_ALL, '') + +def loc_num(x): + """ Return a string of a number in the readable "locale" format. """ + return locale.format("%d", int(x), True) + +requires_api_version = '2.5' +plugin_type = (TYPE_INTERACTIVE,) + +class ListDataCommands: + unknown = "-- Unknown --" + + def __init__(self, name, attr): + self.name = name + self.attr = attr + + def getNames(self): + return ['list-' + self.name] + + def getUsage(self): + return "[PACKAGE|all|installed|updates|extras|obsoletes|recent]" + + def _getSummary(self): + return """\ +Display aggregate data on the %s attribute of a group of packages""" % self.attr + + def getSummary(self): + return self._getSummary() + + def doCheck(self, base, basecmd, extcmds): + pass + + def show_pkgs(self, msg, pkgs): + pass + + def show_data(self, msg, pkgs, name): + if not pkgs: + return + msg("%s %s %s" % ('=' * 20, name, '=' * 20)) + pkgs.sort(key=lambda x: x.name) + calc = {} + for pkg in pkgs: + data = self.get_data(pkg) + calc.setdefault(data, []).append(pkg) + maxlen = 0 + totlen = 0 + for data in calc: + val = len(data) + totlen += len(calc[data]) + if val > maxlen: + maxlen = val + fmt = "%%-%ds %%6s (%%3d%%%%)" % maxlen + for data in sorted(calc): + val = len(calc[data]) + msg(fmt % (str(data), loc_num(val), (100 * val) / totlen)) + self.show_pkgs(msg, calc[data]) + + # pkg.vendor has weird values, for instance + def get_data(self, data): + if not hasattr(data, self.attr): + return self.unknown + + val = getattr(data, self.attr) + if val is None: + return self.unknown + if type(val) == type([]): + return self.unknown + + tval = str(val).strip() + if tval == "": + return self.unknown + + return val + + def doCommand(self, base, basecmd, extcmds): + logger = logging.getLogger("yum.verbose.main") + def msg(x): + logger.log(logginglevels.INFO_2, x) + def msg_warn(x): + logger.warn(x) + + ypl = base.returnPkgLists(extcmds) + self.show_data(msg, ypl.installed, 'Installed Packages') + self.show_data(msg, ypl.available, 'Available Packages') + self.show_data(msg, ypl.extras, 'Extra Packages') + self.show_data(msg, ypl.updates, 'Updated Packages') + self.show_data(msg, ypl.obsoletes, 'Obsoleting Packages') + + return 0, [basecmd + ' done'] + +class InfoDataCommands(ListDataCommands): + def getNames(self): + return ['info-' + self.name] + + def getSummary(self): + return self._getSummary() + "\nAnd list all the packages under each" + + def show_pkgs(self, msg, pkgs): + for pkg in pkgs: + msg(" %s" % (pkg)) + +def url_get_data(self, data): # Special version for baseurl + val = self.oget_data(data) + if val == self.unknown: + return val + (scheme, netloc, path, query, fragid) = urlparse.urlsplit(val) + return "%s://%s/" % (scheme, netloc) + +class SizeRangeData: + def __init__(self, beg, msg): + self._beg = beg + self._msg = msg + + def __cmp__(self, o): + if not hasattr(o, '_beg'): + return 1 + return cmp(self._beg, o._beg) + + def __str__(self): + return self._msg + + def __len__(self): + return len(self._msg) + + def __hash__(self): + return hash(self._msg) + +def size_get_data(self, data): + val = self.oget_data(data) + if val == self.unknown: + return val + + # Even if it was sane, don't put 1GB and up here, or the alpha sorting + # won't be correct. + nums = (( 10 * 1024, " 10KB"), + ( 25 * 1024, " 25KB"), + ( 50 * 1024, " 50KB"), + ( 75 * 1024, " 75KB"), + (100 * 1024, "100KB"), + (250 * 1024, "250KB"), + (500 * 1024, "500KB"), + (750 * 1024, "750KB"), + ( 1 * 1024 * 1024, " 1MB"), + ( 5 * 1024 * 1024, " 5MB"), + ( 10 * 1024 * 1024, " 10MB"), + ( 50 * 1024 * 1024, " 50MB"), + (100 * 1024 * 1024, "100MB"), + (500 * 1024 * 1024, "500MB"), + ) + pnum = (0, " 0KB") + for num in nums: + if val >= pnum[0] and val <= num[0]: + msg = "[ %s - %s ] " % (pnum[1], num[1]) + return SizeRangeData(pnum[0], msg) + pnum = num + msg = "[ %s - %s ] " % (pnum[1], " " * len(pnum[1])) + return SizeRangeData(pnum[0], msg) + +def _list_data_custom(conduit, data, func): + cmd = ListDataCommands(*data) + cmd.oget_data = cmd.get_data + cmd.get_data = types.MethodType(func, cmd) + conduit.registerCommand(cmd) + + cmd = InfoDataCommands(*data) + cmd.oget_data = cmd.get_data + cmd.get_data = types.MethodType(func, cmd) + conduit.registerCommand(cmd) + + +def config_hook(conduit): + ''' + Yum Plugin Config Hook: + Add the 'list-vendors', 'list-baseurls', 'list-packagers', + 'list-buildhosts' commands and the info varients. + ''' + + for data in [('vendors', 'vendor'), + ('groups', 'group'), + ('packagers', 'packager'), + ('licenses', 'license'), + ('arches', 'arch'), + ('committers', 'committer'), + ('buildhosts', 'buildhost')]: + conduit.registerCommand(ListDataCommands(*data)) + conduit.registerCommand(InfoDataCommands(*data)) + + _list_data_custom(conduit, ('baseurls', 'url'), url_get_data) + _list_data_custom(conduit, ('package-sizes', 'packagesize'), size_get_data) + _list_data_custom(conduit, ('archive-sizes', 'archivesize'), size_get_data) + _list_data_custom(conduit, ('installed-sizes', 'installedsize'), + size_get_data) + + # Buildtime/installtime/committime? diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/priorities/priorities.py new/yum-utils-1.1.11/plugins/priorities/priorities.py --- old/yum-utils-1.1.10/plugins/priorities/priorities.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/priorities/priorities.py 2008-01-30 07:03:15.000000000 +0100 @@ -80,17 +80,31 @@ action='store_true', default = False, help="Priority-exclude packages based on name + arch") +def _all_repo_priorities_same(allrepos): + """ Are all repos are at the same priority """ + first = None + for repo in allrepos: + if first is None: + first = repo.priority + elif first != repo.priority: + return False + return True + def exclude_hook(conduit): global only_samearch + allrepos = conduit.getRepos().listEnabled() + + # If they haven't done anything, don't do any work + if _all_repo_priorities_same(allrepos): + return + # Check whether the user specified the --samearch option. opts, commands = conduit.getCmdLine() if opts and opts.samearch: only_samearch = True cnt = 0 - allrepos = conduit.getRepos().listEnabled() - if check_obsoletes: obsoletes = conduit._base.pkgSack.returnObsoletes() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/security/security.py new/yum-utils-1.1.11/plugins/security/security.py --- old/yum-utils-1.1.10/plugins/security/security.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/security/security.py 2008-01-30 07:03:15.000000000 +0100 @@ -159,7 +159,10 @@ return ['list-security', 'list-sec'] def getUsage(self): - return self.getNames()[0] + return "[security|bugzilla|cve] [PACKAGE-wildcard]" + + def getSummary(self): + return "Returns security data for the packages listed, that affects your system" def doCheck(self, base, basecmd, extcmds): pass @@ -250,7 +253,6 @@ return self.show_pkg_info_done[md['update_id']] = True msg(md) - msg('') def show_pkg_exit(self): self.show_pkg_info_done = {} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/tmprepo/tmprepo.conf new/yum-utils-1.1.11/plugins/tmprepo/tmprepo.conf --- old/yum-utils-1.1.10/plugins/tmprepo/tmprepo.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/tmprepo/tmprepo.conf 2008-01-30 07:03:15.000000000 +0100 @@ -0,0 +1,5 @@ +[main] +enabled=1 +# You can uncomment this to allow tmporary repositories to disable/alter +# gpg checking. This is not recommended. +# gpgcheck=false diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/plugins/tmprepo/tmprepo.py new/yum-utils-1.1.11/plugins/tmprepo/tmprepo.py --- old/yum-utils-1.1.10/plugins/tmprepo/tmprepo.py 1970-01-01 01:00:00.000000000 +0100 +++ new/yum-utils-1.1.11/plugins/tmprepo/tmprepo.py 2008-01-30 07:03:15.000000000 +0100 @@ -0,0 +1,103 @@ +#!/usr/bin/python + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# Copyright Red Hat Inc. 2007, 2008 +# +# Author: James Antill <james(a)fedoraproject.com> +# Examples: +# +# yum --tmprepo=http://example.com/foo/bar.repo ... + +import yum +import types +from yum.plugins import TYPE_INTERACTIVE +import logging # for commands +from yum import logginglevels + +import logging +import urlgrabber.grabber +import tempfile + +requires_api_version = '2.5' +plugin_type = (TYPE_INTERACTIVE,) + +def make_validate(log, gpgcheck): + def tvalidate(repo): + if gpgcheck: + + # Don't allow them to set gpgcheck=False + if not repo.gpgcheck: + log.warn("Repo %s tried to set gpgcheck=false" % repo) + return False + + # Don't allow them to set gpgkey=anything + for key in repo.gpgkey: + if not key.startswith('file:/'): + log.warn("Repo %s tried to set gpgkey to %s" % + (repo, repo.gpgkey)) + return False + + return True + + return tvalidate + +def add_repos(base, log, tmp_repos, tvalidate): + """ Add temporary repos to yum. """ + # Don't use self._splitArg()? ... or require URLs without commas? + for trepo in tmp_repos: + tfo = tempfile.NamedTemporaryFile() + fname = tfo.name + grab = urlgrabber.grabber.URLGrabber() + try: + grab.urlgrab(trepo, fname) + except urlgrabber.grabber.URLGrabError, e: + log.warn("Failed to retrieve " + trepo) + continue + + base.getReposFromConfigFile(fname, validate=tvalidate) + added = True + + # Just do it all again... + base.setupProgressCallbacks() + +my_gpgcheck = True +def config_hook(conduit): + ''' + Yum Plugin Config Hook: + Add the --tmprepo option. + ''' + global my_gpgcheck + + parser = conduit.getOptParser() + if not parser: + return + + parser.values.tmp_repos = [] + parser.add_option("--tmprepo", action='append', + type='string', dest='tmp_repos', default=[], + help="enable one or more repositories from URLs", + metavar='[url]') + my_gpgcheck = conduit.confBool('main', 'gpgcheck', default=True) + +def prereposetup_hook(conduit): + ''' + Process the tmp repos from --tmprepos. + ''' + + opts, args = conduit.getCmdLine() + log = logging.getLogger("yum.verbose.main") + add_repos(conduit._base, log, opts.tmp_repos, + make_validate(log, my_gpgcheck)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/repoclosure.py new/yum-utils-1.1.11/repoclosure.py --- old/yum-utils-1.1.10/repoclosure.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/repoclosure.py 2008-01-30 07:03:15.000000000 +0100 @@ -33,7 +33,13 @@ from yum.packageSack import ListPackageSack def parseArgs(): - usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0] + usage = """ + Read in the metadata of a series of repositories and check all the + dependencies in all packages for resolution. Print out the list of + packages with unresolved dependencies + + %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>] + """ % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-c", "--config", default='/etc/yum.conf', help='config file to use (defaults to /etc/yum.conf)') diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/repodiff.py new/yum-utils-1.1.11/repodiff.py --- old/yum-utils-1.1.10/repodiff.py 1970-01-01 01:00:00.000000000 +0100 +++ new/yum-utils-1.1.11/repodiff.py 2008-01-30 07:03:15.000000000 +0100 @@ -0,0 +1,174 @@ +#!/usr/bin/python -tt +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# (c) 2007 Red Hat. Written by skvidal(a)fedoraproject.org + +import yum +import rpmUtils +import sys +import time + +from optparse import OptionParser + +class DiffYum(yum.YumBase): + def __init__(self): + yum.YumBase.__init__(self) + self.dy_repos = {'old':[], 'new':[]} + self.dy_basecachedir = yum.misc.getCacheDir() + + def dy_shutdown_all_other_repos(self): + # disable all the other repos + self.repos.disableRepo('*') + + + def dy_setup_repo(self, repotype, baseurl): + repoid = repotype + str (len(self.dy_repos[repotype]) + 1) + self.dy_repos[repotype].append(repoid) + + # make our new repo obj + newrepo = yum.yumRepo.YumRepository(repoid) + newrepo.name = repoid + newrepo.baseurl = [baseurl] + newrepo.basecachedir = self.dy_basecachedir + newrepo.metadata_expire = 0 + # add our new repo + self.repos.add(newrepo) + # enable that repo + self.repos.enableRepo(repoid) + # setup the repo dirs/etc + self.doRepoSetup(thisrepo=repoid) + archlist = ['src'] + self._getSacks(archlist=archlist, thisrepo=repoid) + + def dy_diff(self): + add = [] + remove = [] + modified = [] + newsack = yum.packageSack.ListPackageSack() + for repoid in self.dy_repos['new']: + newsack.addList(self.pkgSack.returnPackages(repoid=repoid)) + + oldsack = yum.packageSack.ListPackageSack() + for repoid in self.dy_repos['old']: + oldsack.addList(self.pkgSack.returnPackages(repoid=repoid)) + + for pkg in newsack.returnNewestByName(): + tot = self.pkgSack.searchNevra(name=pkg.name) + if len(tot) == 1: # it's only in new + add.append(pkg) + if len(tot) > 1: + if oldsack.contains(name=pkg.name): + newest_old = oldsack.returnNewestByName(name=pkg.name)[0] + modified.append((pkg, newest_old)) + else: + add.append(pkg) + + for pkg in oldsack.returnNewestByName(): + if len(newsack.searchNevra(name=pkg.name)) == 0: + remove.append(pkg) + + return add, remove, modified + + +def parseArgs(args): + """ + Parse the command line args. return a list of 'new' and 'old' repos + """ + usage = """ + repodiff: take 2 or more repositories and return a list of added, removed and changed + packages. + + repodiff --old=old_repo_baseurl --new=new_repo_baseurl """ + + parser = OptionParser(version = "repodiff 0.2", usage=usage) + # query options + parser.add_option("-n", "--new", default=[], action="append", + help="new baseurl[s] for repos") + parser.add_option("-o", "--old", default=[], action="append", + help="old baseurl[s] for repos") + parser.add_option("-q", "--quiet", default=False, action='store_true') + + (opts, argsleft) = parser.parse_args() + + if not opts.new or not opts.old: + parser.print_usage() + sys.exit(1) + + return opts + +def main(args): + opts = parseArgs(args) + + + my = DiffYum() + my.dy_shutdown_all_other_repos() + + if not opts.quiet: print 'setting up repos' + for r in opts.old: + if not opts.quiet: print "setting up old repo %s" % r + try: + my.dy_setup_repo('old', r) + except yum.Errors.RepoError, e: + print "Could not setup repo at url %s: %s" % (r, e) + sys.exit(1) + + for r in opts.new: + if not opts.quiet: print "setting up new repo %s" % r + try: + my.dy_setup_repo('new', r) + except yum.Errors.RepoError, e: + print "Could not setup repo at url %s: %s" % (r, e) + sys.exit(1) + if not opts.quiet: print 'performing the diff' + add, rem, mod = my.dy_diff() + + + + if add: + for pkg in add: + print 'New package %s' % pkg.name + print ' %s' % pkg.summary + + if rem: + for pkg in rem: + print 'Removed package %s' % pkg.name + if mod: + print 'Updated Packages:\n' + for (pkg, oldpkg) in mod: + msg = "%s-%s-%s" % (pkg.name, pkg.ver, pkg.rel) + dashes = "-" * len(msg) + msg += "\n%s\n" % dashes + # get newest clog time from the oldpkg + # for any newer clog in pkg + # print it + oldlogs = oldpkg.changelog + oldlogs.sort() + oldlogs.reverse() + if len(oldlogs): + oldtime = oldlogs[0][0] + clogdelta = [] + for (t, author, content) in pkg.changelog: + if t > oldtime: + msg += "* %s %s\n%s\n\n" % (time.ctime(int(t)), author, content) + + print msg + + +if __name__ == "__main__": + # ARRRRRRGH + if not sys.stdout.isatty(): + import codecs, locale + sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout) + main(sys.argv[1:]) + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/repomanage.py new/yum-utils-1.1.11/repomanage.py --- old/yum-utils-1.1.10/repomanage.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/repomanage.py 2008-01-30 07:03:15.000000000 +0100 @@ -136,7 +136,12 @@ def parseargs(args): - usage = "repomanage [--old] [--new] path." + usage = """ + repomanage: manage a directory of rpm packages. returns lists of newest + or oldest packages in a directory for easy piping to xargs + or similar programs. + repomanage [--old] [--new] path. + """ parser = OptionParser(usage=usage) # new is only used to make sure that the user is not trying to get both diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/repotrack.py new/yum-utils-1.1.11/repotrack.py --- old/yum-utils-1.1.10/repotrack.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/repotrack.py 2008-01-30 07:03:15.000000000 +0100 @@ -82,7 +82,12 @@ return False def parseArgs(): - usage = "usage: %s [options] package1 [package2] [package..]" % sys.argv[0] + usage = """ + Repotrack: keep current on any given pkg and its deps. It will download the package(s) you + want to track and all of their dependencies + + %s [options] package1 [package2] [package..] """ % sys.argv[0] + parser = OptionParser(usage=usage) parser.add_option("-c", "--config", default='/etc/yum.conf', help='config file to use (defaults to /etc/yum.conf)') diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/yum-complete-transaction.py new/yum-utils-1.1.11/yum-complete-transaction.py --- old/yum-utils-1.1.10/yum-complete-transaction.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/yum-complete-transaction.py 2008-01-30 07:03:15.000000000 +0100 @@ -98,7 +98,12 @@ class YumCompleteTransaction(YumUtilBase): NAME = 'yum-complete-transactions' VERSION = '1.0' - USAGE = '"usage: yum-complete-transaction' + USAGE = """ + yum-complete-transaction: completes unfinished yum transactions which occur due to error, failure + or act of $deity + + usage: yum-complete-transaction + """ def __init__(self): YumUtilBase.__init__(self, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/yumdownloader.py new/yum-utils-1.1.11/yumdownloader.py --- old/yum-utils-1.1.10/yumdownloader.py 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/yumdownloader.py 2008-01-30 07:03:15.000000000 +0100 @@ -78,23 +78,40 @@ def setupSourceRepos(self): # enable the -source repos for enabled primary repos archlist = rpmUtils.arch.getArchList() + ['src'] + # Ok, we have src and bin repos. What we want to do here is: + # + # 1. _enable_ source repos for which the bin repos are enabled. + # 2. _disable_ the _other_ src repos. + # + # ...also we don't want to disable the src repos. for #1 and then + # re-enable them as then we get annoying messages and call .close() on + # them losing the primarydb data etc. + + # Get all src repos. + src_repos = {} + for repo in self.repos.findRepos('*-source'): + src_repos[repo.id] = False + + # Find the enabled bin repos, and mark their respective *-source repo. + # as good. for repo in self.repos.listEnabled(): - if not repo.id.endswith('-source'): + if repo.id not in src_repos: srcrepo = '%s-source' % repo.id - else: + if srcrepo in src_repos: + src_repos[srcrepo] = True + + # Toggle src repos that are set the wrong way + for repo in self.repos.findRepos('*-source'): + if repo.isEnabled() and not src_repos[repo.id]: repo.close() self.repos.disableRepo(repo.id) - srcrepo = repo.id - - for r in self.repos.findRepos(srcrepo): - if r in self.repos.listEnabled(): - continue - self.logger.info('Enabling %s repository' % r.id) - r.enable() + if not repo.isEnabled() and src_repos[repo.id]: + self.logger.info('Enabling %s repository' % repo.id) + repo.enable() # Setup the repo, without a cache - r.setup(0) + repo.setup(0) # Setup pkgSack with 'src' in the archlist - self._getSacks(archlist=archlist,thisrepo=r.id) + self._getSacks(archlist=archlist, thisrepo=repo.id) def downloadPackages(self,opts): @@ -203,15 +220,9 @@ def doUtilYumSetup(self,opts): """do a default setup for all the normal/necessary yum components, really just a shorthand for testing""" - # FIXME - we need another way to do this, I think. try: self._getTs() self._getRpmDB() - # if running as non-root and '--source' is specified, then - # disable all enabled *-source repos, because we dont want then to be initialized - # yet. - if self.conf.uid != 0 and opts.source: - self._removeEnabledSourceRepos() self._getRepos() # if '--source' is used the add src to the archlist if opts.source: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.10/yum-utils.spec new/yum-utils-1.1.11/yum-utils.spec --- old/yum-utils-1.1.10/yum-utils.spec 2008-01-03 15:57:26.000000000 +0100 +++ new/yum-utils-1.1.11/yum-utils.spec 2008-01-30 07:03:15.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.10 +Version: 1.1.11 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -203,6 +203,25 @@ This plugin adds the command alias, and parses the aliases config. file to enable aliases. +%package -n yum-list-data +Summary: Yum plugin to list aggregate package data +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-list-data +This plugin adds the commands list-vendors, groups, baseurls, packagers, +buildhosts, licenses and arches. + +%package -n yum-tmprepo +Summary: Yum plugin to add temporary repositories +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-tmprepo +This plugin adds the option --tmprepo which takes a url to a .repo file +downloads it and enables it for a single run. This plugin tries to ensure +that temporary repositories are safe to use, by default, by not allowing +gpg checking to be disabled. %prep %setup -q @@ -215,7 +234,7 @@ # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly upgrade-helper aliases" + security protect-packages basearchonly upgrade-helper aliases list-data tmprepo" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -247,6 +266,7 @@ %{_bindir}/debuginfo-install %{_bindir}/package-cleanup %{_bindir}/repoclosure +%{_bindir}/repodiff %{_bindir}/repomanage %{_bindir}/repoquery %{_bindir}/repotrack @@ -365,10 +385,26 @@ %config(noreplace) %{_sysconfdir}/yum/aliases.conf /usr/lib/yum-plugins/aliases.* +%files -n yum-list-data +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf +/usr/lib/yum-plugins/list-data.* + +%files -n yum-tmprepo +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf +/usr/lib/yum-plugins/tmprepo.* + %changelog +* Wed Jan 30 2008 Tim Lauridsen <timlau(a)fedoraproject.org> +- mark as 1.1.11 +* Sun Jan 13 2008 Seth Vidal <skvidal at fedoraproject.org> +- add repodiff + * Thu Jan 3 2008 Tim Lauridsen <timlau(a)fedoraproject.org> - mark as 1.1.10 + * Thu Dec 12 2007 James Antill <james(a)fedoraproject.org> - Add yum-aliases plugin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bundle-lang-common
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package bundle-lang-common checked in at Thu Jan 31 23:41:01 CET 2008. -------- --- bundle-lang-common/bundle-lang-common.changes 2008-01-30 09:24:58.000000000 +0100 +++ bundle-lang-common/bundle-lang-common.changes 2008-01-31 18:24:46.563213000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 18:24:38 CET 2008 - coolo(a)suse.de + +- sync with actual CD content (alpha2) + +------------------------------------------------------------------- bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ ++++ 966 lines (skipped) ++++ between bundle-lang-common/bundle-lang-common.spec ++++ and bundle-lang-common/bundle-lang-common.spec bundle-lang-gnome.spec: same change bundle-lang-kde.spec: same change ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.Ue1157/_old 2008-01-31 23:33:43.000000000 +0100 +++ /var/tmp/diff_new_pack.Ue1157/_new 2008-01-31 23:33:43.000000000 +0100 @@ -14,7 +14,7 @@ License: X11/MIT Group: System/GUI/KDE Version: 11.0 -Release: 21 +Release: 23 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ packages.txt ++++++ --- bundle-lang-common/packages.txt 2008-01-30 09:20:07.000000000 +0100 +++ bundle-lang-common/packages.txt 2008-01-31 18:23:02.967910000 +0100 @@ -1,101 +1,110 @@ -kde amarok-lang -kde digikam-doc -kde digikam-lang -kde gwenview-lang -kde k3b-lang -kde kaffeine-lang -kde kdebase3-SuSE-lang -kde kdetv-lang -kde kerry-lang -kde kipi-plugins-lang -kde konversation-lang -kde ktorrent-lang -kde libkipi0-lang -kde kdebluetooth-lang -kde kpowersave-lang -gnome at-spi-lang -gnome bug-buddy-lang -gnome control-center2-lang -gnome eel-lang -gnome eog-lang -gnome evince-lang -gnome evolution-data-server-lang -gnome evolution-lang -gnome f-spot-lang -gnome file-roller-lang -gnome gcalctool-lang -gnome gconf-editor-lang -gnome gdm-lang -gnome gedit-lang -gnome glade-lang -gnome gnome-applets-lang -gnome gnome-commander-lang -gnome gnome-cups-manager-lang -gnome gnome-desktop-lang -gnome gnome-mag-lang -gnome gnome-main-menu-lang -gnome gnome-media-lang -gnome gnome-menus-lang -gnome gnome-mount-lang -gnome gnome-nettool-lang -gnome gnome-panel-lang -gnome gnome-power-manager-lang -gnome gnome-screensaver-lang -gnome gnome-session-lang -gnome gnome-spell2-lang -gnome gnome-system-monitor-lang -gnome gnome-terminal-lang -gnome gnome-utils-lang -gnome gnome-volume-manager-lang -gnome brasero-lang -gnome gtk-lang -gnome gtk2-engines-lang -gnome gtkhtml2-lang -gnome gtksourceview-lang -gnome gtkspell-lang -gnome gucharmap-lang -gnome libgalago-gtk-lang -gnome libgalago-lang -gnome libgnomekbd-lang -gnome libgtop-lang -gnome libssui-lang -gnome libwnck-lang -gnome liferea-lang -gnome metacity-lang -gnome nautilus-cd-burner-lang -gnome nautilus-open-terminal-lang -gnome nautilus-sendto-lang -gnome nautilus-share-lang -gnome nautilus-lang -gnome notification-daemon-lang -gnome orca-lang -gnome libpurple-lang -gnome scrollkeeper-lang -gnome tomboy-lang -gnome totem-lang -gnome vino-lang -gnome vte-lang -gnome yelp-lang -gnome zenity-lang -gnome gnome-keyring-manager-lang -gnome bluez-gnome-lang -gnome gsynaptics-lang -gnome resapplet-lang -gnome atk-lang -gnome beagle-lang -gnome gail-lang -gnome gnome-keyring-lang -gnome gnome-vfs2-lang -gnome gtk2-lang -gnome libbonobo-lang -gnome libbonoboui-lang -gnome libgnomecanvas-lang -gnome libgnomecups-lang -gnome libgnome-lang -gnome libgnomeprint-lang -gnome libgnomeprintui-lang -gnome libgnomesu-lang -gnome libgnomeui-lang -gnome libgphoto2-lang -common gconf2-lang -common glib2-lang +amarok-lang kde +atk-lang common +at-spi-lang gnome +avahi-lang common +beagle-lang gnome +bluez-gnome-lang gnome +brasero-lang gnome +bug-buddy-lang gnome +control-center2-lang gnome +digikam-doc kde +digikam-lang kde +eel-lang gnome +eog-lang gnome +evince-lang gnome +evolution-data-server-lang gnome +evolution-lang gnome +file-roller-lang gnome +f-spot-lang gnome +gail-lang common +gcalctool-lang gnome +gconf2-lang common +gconf-editor-lang gnome +gdm-lang gnome +gedit-lang gnome +gimp-lang gnome +glade-lang gnome +glib2-lang common +gnome-applets-lang gnome +gnome-commander-lang gnome +gnome-cups-manager-lang gnome +gnome-desktop-lang gnome +gnome-keyring-lang common +gnome-keyring-manager-lang gnome +gnome-mag-lang gnome +gnome-main-menu-lang gnome +gnome-media-lang gnome +gnome-menus-lang gnome +gnome-mount-lang gnome +gnome-nettool-lang gnome +gnome-panel-lang gnome +gnome-power-manager-lang gnome +gnome-screensaver-lang gnome +gnome-session-lang gnome +gnome-spell2-lang gnome +gnome-system-monitor-lang gnome +gnome-terminal-lang gnome +gnome-utils-lang gnome +gnome-vfs2-lang gnome +gnome-vfs2-lang kde +gnome-volume-manager-lang gnome +gstreamer-0_10-lang common +gstreamer-0_10-plugins-base-lang common +gstreamer-0_10-plugins-good-lang common +gsynaptics-lang gnome +gtk2-engines-lang gnome +gtk2-lang common +gtkhtml2-lang gnome +gtk-lang gnome +gtksourceview-lang gnome +gtkspell-lang gnome +gucharmap-lang gnome +gvfs-lang common +gwenview-lang kde +k3b-lang kde +kaffeine-lang kde +kdebase3-SuSE-lang kde +kdebluetooth-lang kde +kdetv-lang kde +kerry-lang kde +kipi-plugins-lang kde +konversation-lang kde +kpowersave-lang kde +ktorrent-lang kde +libbonobo-lang common +libbonoboui-lang common +libgalago-gtk-lang gnome +libgalago-lang gnome +libgda-lang gnome +libgnomecanvas-lang common +libgnomecups-lang common +libgnomekbd-lang gnome +libgnome-lang common +libgnomeprint-lang common +libgnomeprintui-lang common +libgnomesu-lang common +libgnomeui-lang common +libgphoto2-lang gnome +libgtop-lang gnome +libgweather-lang gnome +libkipi0-lang kde +libpurple-lang gnome +libssui-lang gnome +libwnck-lang gnome +liferea-lang gnome +metacity-lang gnome +nautilus-cd-burner-lang gnome +nautilus-lang gnome +nautilus-open-terminal-lang gnome +nautilus-sendto-lang gnome +nautilus-share-lang gnome +notification-daemon-lang gnome +orca-lang gnome +resapplet-lang gnome +scrollkeeper-lang gnome +tomboy-lang gnome +totem-lang gnome +vino-lang gnome +vte-lang gnome +yelp-lang gnome +zenity-lang gnome ++++++ pre_checkin.sh ++++++ --- bundle-lang-common/pre_checkin.sh 2008-01-30 09:24:02.000000000 +0100 +++ bundle-lang-common/pre_checkin.sh 2008-01-31 18:23:57.884932000 +0100 @@ -10,7 +10,7 @@ for spec in $bundles; do filename=bundle-lang-$spec.spec - packages=`grep ^$spec packages.txt | cut -d' ' -f2-` + packages=`grep " $spec"'$' packages.txt | cut -d' ' -f1` packages=`echo $packages` { sed -n -e '1,/#LANGUAGES/p' bundle-lang.spec.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-theme
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-theme checked in at Thu Jan 31 23:33:24 CET 2008. -------- --- yast2-theme/yast2-theme.changes 2008-01-30 17:00:45.000000000 +0100 +++ yast2-theme/yast2-theme.changes 2008-01-31 16:51:44.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 16:51:29 CET 2008 - coolo(a)suse.de + +- fixing colour palette +- V 2.16.9 + +------------------------------------------------------------------- Old: ---- yast2-theme-2.16.8.tar.bz2 New: ---- yast2-theme-2.16.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.l32125/_old 2008-01-31 23:32:51.000000000 +0100 +++ /var/tmp/diff_new_pack.l32125/_new 2008-01-31 23:32:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-theme (Version 2.16.8) +# spec file for package yast2-theme (Version 2.16.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-theme -Version: 2.16.8 +Version: 2.16.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-theme-2.16.8.tar.bz2 +Source0: yast2-theme-2.16.9.tar.bz2 Prefix: /usr BuildRequires: hicolor-icon-theme pkg-config update-desktop-files yast2 yast2-core yast2-devtools BuildArch: noarch @@ -33,7 +33,7 @@ %package openSUSE Summary: YaST2 - Theme (openSUSE) -Version: 2.16.8 +Version: 2.16.9 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -45,7 +45,7 @@ %package openSUSE-Crystal Summary: YaST2 - Theme (openSUSE) -Version: 2.16.8 +Version: 2.16.9 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -71,7 +71,7 @@ Ken Wimer <wimer(a)suse.de> %prep -%setup -n yast2-theme-2.16.8 +%setup -n yast2-theme-2.16.9 %build %{prefix}/bin/y2tool y2autoconf @@ -158,6 +158,9 @@ # remove the file when removing the RPM %ghost /usr/share/YaST2/theme/current %changelog +* Thu Jan 31 2008 coolo(a)suse.de +- fixing colour palette +- V 2.16.9 * Wed Jan 30 2008 coolo(a)suse.de - updates to the themeing - V 2.16.8 ++++++ yast2-theme-2.16.8.tar.bz2 -> yast2-theme-2.16.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.16.8/openSUSE/wizard/style.qss new/yast2-theme-2.16.9/openSUSE/wizard/style.qss --- old/yast2-theme-2.16.8/openSUSE/wizard/style.qss 2008-01-30 16:59:29.000000000 +0100 +++ new/yast2-theme-2.16.9/openSUSE/wizard/style.qss 2008-01-31 16:50:56.000000000 +0100 @@ -31,7 +31,7 @@ } YQRichText > YQTextBrowser { - background-color: rgba(55, 255, 255, 100); + background-color: rgba(255, 255, 255, 100); } QTextBrowser { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.16.8/VERSION new/yast2-theme-2.16.9/VERSION --- old/yast2-theme-2.16.8/VERSION 2008-01-30 17:00:19.000000000 +0100 +++ new/yast2-theme-2.16.9/VERSION 2008-01-31 16:51:47.000000000 +0100 @@ -1 +1 @@ -2.16.8 +2.16.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-installation checked in at Thu Jan 31 23:26:04 CET 2008. -------- --- yast2-installation/yast2-installation.changes 2008-01-31 11:19:26.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2008-01-31 12:59:12.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 31 12:58:42 CET 2008 - locilka(a)suse.cz + +- Fixed inst_restore_settings client: NetworkDevices are now + NetworkInterfaces. +- 2.16.14 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.16.13.tar.bz2 New: ---- yast2-installation-2.16.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.X13855/_old 2008-01-31 23:22:10.000000000 +0100 +++ /var/tmp/diff_new_pack.X13855/_new 2008-01-31 23:22:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.13) +# spec file for package yast2-installation (Version 2.16.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.16.13 +Version: 2.16.14 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.13.tar.bz2 +Source0: yast2-installation-2.16.14.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # Mode::live_installation @@ -71,12 +71,12 @@ Summary: YaST2 - Installation Parts %package devel-doc -Version: 2.16.13 +Version: 2.16.14 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.13.tar.bz2 +Source0: yast2-installation-2.16.14.tar.bz2 Prefix: /usr Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq @@ -109,7 +109,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.16.13 +%setup -n yast2-installation-2.16.14 %build %{prefix}/bin/y2tool y2autoconf @@ -174,9 +174,12 @@ %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README - %changelog * Thu Jan 31 2008 locilka(a)suse.cz +- Fixed inst_restore_settings client: NetworkDevices are now + NetworkInterfaces. +- 2.16.14 +* Thu Jan 31 2008 locilka(a)suse.cz - Added docu. for *_finish scripts (needed for FATE #302980). - Welcome dialog can newly show the license according to the just selected language and also show other lozalizations if needed. ++++++ yast2-installation-2.16.13.tar.bz2 -> yast2-installation-2.16.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.13/src/clients/inst_restore_settings.ycp new/yast2-installation-2.16.14/src/clients/inst_restore_settings.ycp --- old/yast2-installation-2.16.13/src/clients/inst_restore_settings.ycp 2007-06-13 15:50:39.000000000 +0200 +++ new/yast2-installation-2.16.14/src/clients/inst_restore_settings.ycp 2008-01-31 12:59:25.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Restore settings after restart during 2nd-stage installation * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: inst_restore_settings.ycp 38430 2007-06-13 13:50:38Z locilka $ + * $Id: inst_restore_settings.ycp 44048 2008-01-31 11:59:24Z locilka $ * */ @@ -14,7 +14,7 @@ import "GetInstArgs"; import "Service"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "SuSEFirewall"; if(GetInstArgs::going_back()) @@ -33,7 +33,7 @@ } }); -NetworkDevices::Read (); +NetworkInterfaces::Read (); // bugzilla #282871 // If firewall is enabled, only the initial script is started. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.13/VERSION new/yast2-installation-2.16.14/VERSION --- old/yast2-installation-2.16.13/VERSION 2008-01-31 11:21:47.000000000 +0100 +++ new/yast2-installation-2.16.14/VERSION 2008-01-31 12:58:32.000000000 +0100 @@ -1 +1 @@ -2.16.13 +2.16.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-add-on
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-add-on checked in at Thu Jan 31 23:22:01 CET 2008. -------- --- yast2-add-on/yast2-add-on.changes 2007-10-24 16:28:16.000000000 +0200 +++ yast2-add-on/yast2-add-on.changes 2008-01-31 12:22:17.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 20 13:33:28 CET 2007 - locilka(a)suse.cz + +- Displaying busy-message when removing add-on (#305807). +- 2.16.1 + +------------------------------------------------------------------- +Mon Nov 19 16:46:21 CET 2007 - locilka(a)suse.cz + +- Fixed / unified used terminology (repositories) (FATE #302970). + +------------------------------------------------------------------- Old: ---- yast2-add-on-2.16.0.tar.bz2 New: ---- yast2-add-on-2.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.LR6106/_old 2008-01-31 23:18:03.000000000 +0100 +++ /var/tmp/diff_new_pack.LR6106/_new 2008-01-31 23:18:03.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-add-on (Version 2.16.0) +# spec file for package yast2-add-on (Version 2.16.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-add-on -Version: 2.16.0 +Version: 2.16.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.16.0.tar.bz2 +Source0: yast2-add-on-2.16.1.tar.bz2 Prefix: /usr Requires: autoyast2-installation # WorkflowManager module @@ -48,7 +48,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-add-on-2.16.0 +%setup -n yast2-add-on-2.16.1 %build %{prefix}/bin/y2tool y2autoconf @@ -86,26 +86,31 @@ /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc %doc %{prefix}/share/doc/packages/yast2-add-on %changelog -* Wed Oct 24 2007 - locilka(a)suse.cz +* Tue Nov 20 2007 locilka(a)suse.cz +- Displaying busy-message when removing add-on (#305807). +- 2.16.1 +* Mon Nov 19 2007 locilka(a)suse.cz +- Fixed / unified used terminology (repositories) (FATE #302970). +* Wed Oct 24 2007 locilka(a)suse.cz - Changes in StorageDevices module API (#335582). - 2.16.0 -* Thu Oct 11 2007 - locilka(a)suse.cz +* Thu Oct 11 2007 locilka(a)suse.cz - List Product Name, then Product URL instead if vice versa (#332837). -* Mon Sep 24 2007 - locilka(a)suse.cz +* Mon Sep 24 2007 locilka(a)suse.cz - Do not ask whether to install packages in the inst-sys (#327742). - 2.15.17 -* Mon Sep 24 2007 - locilka(a)suse.cz +* Mon Sep 24 2007 locilka(a)suse.cz - Calling Pkg::SourceReleaseAll(); after a new Add-On is used and completely merged (#293428 c#44). - 2.15.16 -* Wed Sep 05 2007 - locilka(a)suse.cz +* Wed Sep 05 2007 locilka(a)suse.cz - NotEnoughMemory-functions moved to a separate misc.ycp include file to make them possible to be used from packager (#305554). - Skipping Add-Ons when requested by user (#305554). - Adjusted RPM dependencies. - 2.15.15 -* Wed Aug 29 2007 - locilka(a)suse.cz +* Wed Aug 29 2007 locilka(a)suse.cz - Using new Wizard window without installation steps displayed when adding new Add-On. Dialog help is visible immediately. Restoring dialog buttons when redrawing list of used Add-Ons (#305788). @@ -117,43 +122,43 @@ - Disabling [ Next ] button in Media Selection dialog unless some media type is selected (#305850). - 2.15.14 -* Mon Aug 27 2007 - locilka(a)suse.cz +* Mon Aug 27 2007 locilka(a)suse.cz - Adjusting Add-On's name if set in SourceDialogs when adding it during installation and on a running system (#304659). - 2.15.13 -* Wed Aug 22 2007 - locilka(a)suse.cz +* Wed Aug 22 2007 locilka(a)suse.cz - Disabled [ Back ] button and using [ Cancel ] instead of [ Abort ] button in the "New Add-On" dialog (#298052). - Do not ask whether to abort the Add-On configuration when [ Cancel ] clicked in installation, just return to the previous dialog (#298052). - 2.15.12 -* Mon Aug 06 2007 - locilka(a)suse.cz +* Mon Aug 06 2007 locilka(a)suse.cz - Fixed text by proofreading. - 2.15.11 -* Fri Jun 22 2007 - locilka(a)suse.cz +* Fri Jun 22 2007 locilka(a)suse.cz - Added a code checking for open/closed dialogs after Pkg bindings were called to use a new Add-On product. - 2.15.10 -* Fri Jun 01 2007 - locilka(a)suse.cz +* Fri Jun 01 2007 locilka(a)suse.cz - Fixed Add-On client to provide command-line again. Providing "help" and "longhelp" (#279074). - Fixed Add-On workflow to store the "PRODUCT" tag from content file for later usage in AutoYaST cloning (#279893). - 2.15.9 -* Fri May 25 2007 - jsrain(a)suse.cz +* Fri May 25 2007 jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) -* Mon May 14 2007 - jsrain(a)suse.cz +* Mon May 14 2007 jsrain(a)suse.cz - Fixed Add-Ons in AutoYaST Write function to Integrate all Add-Ons via AddOnProduct::Integrate (#260613). - 2.15.8 -* Wed May 02 2007 - locilka(a)suse.cz +* Wed May 02 2007 locilka(a)suse.cz - CommandLine interface (no support reported) for add-on (#269886) - CommandLine interface (no support reported) for vendor (#269911) - 2.15.7 -* Wed Apr 04 2007 - ug(a)suse.de +* Wed Apr 04 2007 ug(a)suse.de - signature checks for individual add-ons for autoyast -* Fri Mar 30 2007 - locilka(a)suse.cz +* Fri Mar 30 2007 locilka(a)suse.cz - Reporting Low-Memory issue during installation on machines with less than 384 MB (-5%%) of total memory (together with available swap). User is warned not to use Add-Ons in such case (bugzilla @@ -163,41 +168,41 @@ [#301928]). - Adjusted RPM dependencies - 2.15.6 -* Wed Mar 28 2007 - locilka(a)suse.cz +* Wed Mar 28 2007 locilka(a)suse.cz - Adjusted to use WorkflowManager instead of AddOnProduct module in some cases (for FATE #129). - Adjusted RPM requirements and BuildRequires. - 2.15.5 -* Tue Mar 13 2007 - locilka(a)suse.cz +* Tue Mar 13 2007 locilka(a)suse.cz - Redraw Wizard steps when Add-Ons are changed in the installation proposal. This change allows to reflect the current workflow look just after the workflow change is made (#254035). - Adjusted RPM dependencies (yast2-packager). - 2.15.4 -* Mon Mar 05 2007 - locilka(a)suse.cz +* Mon Mar 05 2007 locilka(a)suse.cz - Moving AddOnProduct module back to yast2-installation because this module is needed in the second-stage installation. - AddOnProduct-related testsuites moved back to yast2-installation. - 2.15.3 -* Mon Feb 26 2007 - locilka(a)suse.cz +* Mon Feb 26 2007 locilka(a)suse.cz - Fixing RPM spec file to properly cover all files included in it. - 2.15.2 -* Fri Feb 23 2007 - locilka(a)suse.cz +* Fri Feb 23 2007 locilka(a)suse.cz - Fixed registering new agents when y2update is part of the Add-On media (#245508) also for mode "update" and "autoinstallation" by using Stage::initial only (#247892). - 2.15.1 -* Thu Feb 22 2007 - locilka(a)suse.cz +* Thu Feb 22 2007 locilka(a)suse.cz - Added forgotten inst_add-on and inst_language_add-on client from yast2-installation. - Added autoyast2-installation into Requires because of the second stage installation. - Added forgotten testsuites from yast2-installation. - Fixed paths to included files and textdomain. -* Fri Feb 16 2007 - locilka(a)suse.cz +* Fri Feb 16 2007 locilka(a)suse.cz - Registering new agents when y2update is part of the Add-On media, some agents might have been added (#245508). -* Fri Feb 16 2007 - locilka(a)suse.cz +* Fri Feb 16 2007 locilka(a)suse.cz - initial version split from yast2-installation-2.15.8 to minimize required packages (#238673). - 2.15.0 ++++++ yast2-add-on-2.16.0.tar.bz2 -> yast2-add-on-2.16.1.tar.bz2 ++++++ ++++ 3900 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/configure.in new/yast2-add-on-2.16.1/configure.in --- old/yast2-add-on-2.16.0/configure.in 2007-08-29 13:18:27.000000000 +0200 +++ new/yast2-add-on-2.16.1/configure.in 2008-01-31 12:22:36.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-add-on dnl -dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-add-on, 2.15.14, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 2.16.1, http://bugs.opensuse.org/, yast2-add-on) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,10 +14,11 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.15.14" +VERSION="2.16.1" RPMNAME="yast2-add-on" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/COPYRIGHT.english new/yast2-add-on-2.16.1/COPYRIGHT.english --- old/yast2-add-on-2.16.0/COPYRIGHT.english 2007-10-24 16:47:01.000000000 +0200 +++ new/yast2-add-on-2.16.1/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/Makefile.am new/yast2-add-on-2.16.1/Makefile.am --- old/yast2-add-on-2.16.0/Makefile.am 2007-08-29 13:18:27.000000000 +0200 +++ new/yast2-add-on-2.16.1/Makefile.am 2008-01-31 12:22:37.000000000 +0100 @@ -23,14 +23,15 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/missing new/yast2-add-on-2.16.1/missing --- old/yast2-add-on-2.16.0/missing 2007-08-29 13:18:33.000000000 +0200 +++ new/yast2-add-on-2.16.1/missing 2008-01-31 12:22:43.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/src/add-on-workflow.ycp new/yast2-add-on-2.16.1/src/add-on-workflow.ycp --- old/yast2-add-on-2.16.0/src/add-on-workflow.ycp 2007-10-11 11:02:28.000000000 +0200 +++ new/yast2-add-on-2.16.1/src/add-on-workflow.ycp 2007-12-10 16:09:10.000000000 +0100 @@ -32,6 +32,7 @@ import "Confirm"; import "GetInstArgs"; import "Installation"; +import "PackageCallbacks"; include "packager/inst_source_dialogs.ycp"; include "add-on/misc.ycp"; @@ -139,7 +140,7 @@ // dialog caption string title = _("Add-On Product Media"); // help - string help_text = _("<big>Catalog Media</big> + string help_text = _("<big>Software Repository</big> Add-on products can be installed from CD, over a network, or from the hard disk. "); @@ -276,7 +277,7 @@ ) { Report::Error (sformat ( // popup error message, %1 is the package name - _("Cannot search for SLP installation sources + _("Cannot search for SLP installation repositories without having %1 package installed"), required_package )); @@ -394,7 +395,7 @@ if (size (sources) == 0) { // error report - Report::Error (_("No catalog found on medium.")); + Report::Error (_("No software repository found on medium.")); y2milestone ("CatalogSelect Dialog ret: %1", `back); return `back; } @@ -439,7 +440,7 @@ if (src_id == -1) { // error report - Report::Error (_("Failed to initialize the catalog.")); + Report::Error (_("Failed to initialize the software repository.")); AddOnProduct::ClearRegistrationRequest (src_id); y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); @@ -466,16 +467,16 @@ }); // dialog caption - string title = _("Catalog Selection"); + string title = _("Software Repository Selection"); // help text - string help_text = _("<big>Catalog Selection</big> -There were multiple catalogs found on the selected medium. -Select the catalog to use. + string help_text = _("<big>Software Repository Selection</big> +There were multiple repositories found on the selected medium. +Select the repository to use. "); term contents = `HBox (`HSpacing(4), `VBox ( `VSpacing (2), - `SelectionBox (`id (`catalogs), _("&Found Catalogs"), catalogs), + `SelectionBox (`id (`catalogs), _("Repositories &Found"), catalogs), `VSpacing (2) ), `HSpacing (4)); Wizard::SetContents (title, contents, help_text, true, true); @@ -511,7 +512,7 @@ { ret = nil; // popup message - Popup::Message (_("Select a catalog.")); + Popup::Message (_("Select a repository.")); } } } @@ -542,7 +543,7 @@ if (selected == -1) { // error report - Report::Error (_("Failed to initialize the catalog.")); + Report::Error (_("Failed to initialize the software repository.")); AddOnProduct::ClearRegistrationRequest (selected); y2milestone ("CatalogSelect Dialog ret: %1", `finish); @@ -612,7 +613,7 @@ AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id, // table cell - "product" : ((new_addon_name != "" && new_addon_name != nil) ? new_addon_name : _("No product found in the catalog")), + "product" : ((new_addon_name != "" && new_addon_name != nil) ? new_addon_name : _("No product found in the repository")), "media_url" : url, "product_dir" : product_dir, ]); @@ -766,7 +767,7 @@ ), `HStretch ()); // help text string help_text = _("<big>Product Selection</big> -There were multiple products found in the catalog. Select the products +There were multiple products found in the repository. Select the products to install. "); Wizard::SetContents (title, contents, help_text, true, true); @@ -1009,6 +1010,33 @@ } } +void RemoveSelectedAddOn (integer selected) { + y2milestone ("Deleting %1 %2", selected, AddOnProduct::add_on_products[selected]:nil); + + // remove whole media if the product is the only one on the media + integer media = AddOnProduct::add_on_products[selected, "media"]:-1; + integer med_count = size (filter (map<string,any> prod, AddOnProduct::add_on_products, { + return prod["media"]:-1 == media; + })); + + if (med_count == 1) { + y2milestone ("Deleting source %1", media); + Pkg::SourceDelete (media); + } + + // remove the selected record + AddOnProduct::add_on_products[selected] = nil; + AddOnProduct::add_on_products = filter (map<string,any> prod, AddOnProduct::add_on_products, { + return prod != nil; + }); + + // Remove product from add-ons + AddOnProduct::Disintegrate (media); + + // remove product from list of product to register (FATE #301312) + AddOnProduct::RemoveRegistrationFlag (media); +} + // bugzilla #221377 // the original control file is stored as /control.xml // the other (added) control files are under the @@ -1083,37 +1111,16 @@ if (! Confirm::DeleteSelected()) { continue; } - y2milestone ("Deleting %1 %2", selected, AddOnProduct::add_on_products[selected]:nil); - - // remove whole media if the product is the only one on the media - integer media = AddOnProduct::add_on_products[selected, "media"]:-1; - integer med_count = size (filter (map<string,any> prod, - AddOnProduct::add_on_products, - { - return prod["media"]:-1 == media; - })); - if (med_count == 1) { - y2milestone ("Deleting source %1", media); - Pkg::SourceDelete (media); - } - // remove the selected record - AddOnProduct::add_on_products[selected] = nil; - AddOnProduct::add_on_products = filter (map<string,any> prod, - AddOnProduct::add_on_products, - { - return prod != nil; - }); + // TRANSLATORS: busy message + UI::OpenDialog (`Label (_("Removing selected add-on..."))); - // Remove product from add-ons - AddOnProduct::Disintegrate (media); - + RemoveSelectedAddOn (selected); some_addon_changed = true; - // remove product from list of product to register (FATE #301312) - AddOnProduct::RemoveRegistrationFlag (media); - - Redraw (enable_back, enable_next, back_button, next_button); + UI::CloseDialog(); + + Redraw (enable_back, enable_next, back_button, next_button); // adding new add-on } else if (ret == `add) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/src/add-on.ycp new/yast2-add-on-2.16.1/src/add-on.ycp --- old/yast2-add-on-2.16.0/src/add-on.ycp 2007-09-24 09:25:06.000000000 +0200 +++ new/yast2-add-on-2.16.1/src/add-on.ycp 2007-11-19 16:45:26.000000000 +0100 @@ -120,7 +120,7 @@ string heading = _("Add-On Product Installation"); // feedback message string message - = _("Reading packages available on the installation sources..."); + = _("Reading packages available at the installation repositories..."); Popup::ShowFeedback (heading, message); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-add-on-2.16.0/VERSION new/yast2-add-on-2.16.1/VERSION --- old/yast2-add-on-2.16.0/VERSION 2007-10-24 16:30:00.000000000 +0200 +++ new/yast2-add-on-2.16.1/VERSION 2008-01-31 12:22:22.000000000 +0100 @@ -1 +1 @@ -2.16.0 +2.16.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package skelcd-control-openSUSE checked in at Thu Jan 31 23:17:51 CET 2008. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE-CD.changes 2008-01-30 16:31:52.000000000 +0100 +++ skelcd-control-openSUSE/skelcd-control-openSUSE-CD.changes 2008-01-31 12:45:08.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 12:44:44 CET 2008 - locilka(a)suse.cz + +- Fixed patch for CD version. + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-CD.spec ++++++ --- /var/tmp/diff_new_pack.p16914/_old 2008-01-31 23:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.p16914/_new 2008-01-31 23:06:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE-CD (Version 2008.1.30) +# spec file for package skelcd-control-openSUSE-CD (Version 2008.1.31) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: YaST License Group: Metapackages AutoReqProv: off -Version: 2008.1.30 +Version: 2008.1.31 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +50,7 @@ # Verify syntax # cd $RPM_SOURCE_DIR -patch -p0 < $RPM_SOURCE_DIR/control-cd.xml.diff +patch --ignore-whitespace -p0 < $RPM_SOURCE_DIR/control-cd.xml.diff xmllint -noout $RPM_SOURCE_DIR/control.xml echo "**********************************************************" ls -lh $RPM_SOURCE_DIR @@ -63,6 +63,8 @@ /CD1/control.xml %changelog +* Thu Jan 31 2008 locilka(a)suse.cz +- Fixed patch for CD version. * Wed Jan 30 2008 fehr(a)suse.de - Added disk proposal to after the software/desktop selection. * Wed Jan 30 2008 locilka(a)suse.cz ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.p16914/_old 2008-01-31 23:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.p16914/_new 2008-01-31 23:06:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE (Version 2008.1.30) +# spec file for package skelcd-control-openSUSE (Version 2008.1.31) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: YaST License Group: Metapackages AutoReqProv: off -Version: 2008.1.30 +Version: 2008.1.31 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,6 +56,8 @@ /CD1/control.xml %changelog +* Thu Jan 31 2008 locilka(a)suse.cz +- Fixed patch for CD version. * Wed Jan 30 2008 fehr(a)suse.de - Added disk proposal to after the software/desktop selection. * Wed Jan 30 2008 locilka(a)suse.cz ++++++ control-cd.xml.diff ++++++ --- /var/tmp/diff_new_pack.p16914/_old 2008-01-31 23:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.p16914/_new 2008-01-31 23:06:34.000000000 +0100 @@ -1,6 +1,6 @@ ---- control.xml.orig 2007-12-18 16:58:38.000000000 +0100 -+++ control.xml 2007-12-19 20:40:50.596984000 +0100 -@@ -40,7 +40,7 @@ +--- control.xml 2008-01-30 15:06:00.000000000 +0100 ++++ control.xml 2008-01-31 12:40:01.000000000 +0100 +@@ -43,7 +43,7 @@ <selection_type config:type="symbol">auto</selection_type>  @@ -8,17 +8,17 @@ + <online_repos_preselected config:type="boolean">true</online_repos_preselected>  - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_103_Servers.xml</external_sources_link> -@@ -287,10 +287,12 @@ + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_110_Servers.xml</external_sources_link> +@@ -286,10 +286,12 @@ </arguments> <enable_back>yes</enable_back> </module> -+  - <module> - <heading>yes</heading> - <label>Installation</label> + <module> + <label>Disk</label> + <name>disk_proposal</name> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hal
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package hal checked in at Thu Jan 31 19:57:18 CET 2008. -------- --- hal/hal.changes 2008-01-29 23:57:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-01-31 17:13:52.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 17:11:18 CET 2008 - dkukawka(a)suse.de + +- added new patch: + - hal-fix-mmap_cache_force.diff: fixed b.n.c #357625, removed + no longer existing --force argument from call + hald-generate-fdi-cache inside of HAL. + +------------------------------------------------------------------- hal-doc.changes: same change New: ---- hal-fix-mmap_cache_force.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.Tc5095/_old 2008-01-31 19:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Tc5095/_new 2008-01-31 19:55:59.000000000 +0100 @@ -23,7 +23,7 @@ License: Other uncritical OpenSource License Group: System/Daemons Version: 0.5.10_git20080129 -Release: 1 +Release: 3 AutoReqProv: on Requires: pm-utils BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files @@ -72,6 +72,7 @@ Patch10: hal-add-standby-support.diff # submitted (or planed to do in next time) upstream patches Patch100: hal-acpi_high_rate_calculate_on_time.diff +Patch101: hal-fix-mmap_cache_force.diff # backports from git master: #Patch200: hal-master.diff # revert from HEAD: @@ -161,6 +162,7 @@ %patch3 -p0 %patch10 -p0 %patch100 -p1 +%patch101 -p1 #%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 @@ -327,6 +329,11 @@ %endif %changelog +* Thu Jan 31 2008 dkukawka(a)suse.de +- added new patch: + - hal-fix-mmap_cache_force.diff: fixed b.n.c #357625, removed + no longer existing --force argument from call + hald-generate-fdi-cache inside of HAL. * Wed Jan 30 2008 dkukawka(a)suse.de - updated hal and hal-info to git master from 20080128: - HAL use now the sysfs battery interface in the power_supply ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.Tc5095/_old 2008-01-31 19:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Tc5095/_new 2008-01-31 19:55:59.000000000 +0100 @@ -23,7 +23,7 @@ License: GPL v2 or later; AFL Group: System/Daemons Version: 0.5.10_git20080129 -Release: 1 +Release: 3 AutoReqProv: on Requires: pm-utils BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files @@ -72,6 +72,7 @@ Patch10: hal-add-standby-support.diff # submitted (or planed to do in next time) upstream patches Patch100: hal-acpi_high_rate_calculate_on_time.diff +Patch101: hal-fix-mmap_cache_force.diff # backports from git master: #Patch200: hal-master.diff # revert from HEAD: @@ -161,6 +162,7 @@ %patch3 -p0 %patch10 -p0 %patch100 -p1 +%patch101 -p1 #%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 @@ -327,6 +329,11 @@ %endif %changelog +* Thu Jan 31 2008 dkukawka(a)suse.de +- added new patch: + - hal-fix-mmap_cache_force.diff: fixed b.n.c #357625, removed + no longer existing --force argument from call + hald-generate-fdi-cache inside of HAL. * Wed Jan 30 2008 dkukawka(a)suse.de - updated hal and hal-info to git master from 20080128: - HAL use now the sysfs battery interface in the power_supply ++++++ hal-fix-mmap_cache_force.diff ++++++ commit f6f3a6b0feadca67f4026630ff8e9137c1675f86 Author: Danny Kukawka <danny.kukawka(a)web.de> Date: Thu Jan 31 17:09:12 2008 +0100 fix call hald-generate-fdi-cache, removed --force argument Removed --force argument from call hald-generate-fdi-cache in hald/mmap_cache.c since the option don't exist. diff --git a/hald/mmap_cache.c b/hald/mmap_cache.c index db660a0..ac35685 100644 --- a/hald/mmap_cache.c +++ b/hald/mmap_cache.c @@ -143,7 +143,7 @@ regen_cache (void) regen_cache_done = FALSE; hald_runner_run_sync (NULL, - "hald-generate-fdi-cache --force", + "hald-generate-fdi-cache", extra_env, 60000, regen_cache_cb, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-packager checked in at Thu Jan 31 12:17:22 CET 2008. -------- --- yast2-packager/yast2-packager.changes 2008-01-27 20:58:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-01-31 11:19:29.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Jan 31 11:17:06 CET 2008 - locilka(a)suse.cz + +- Reworked ProductLicense module to handle first-stage installation + license. +- 2.16.18 + +------------------------------------------------------------------- +Tue Jan 29 20:14:27 CET 2008 - locilka(a)suse.cz + +- Unified DefaultDesktop module and software/desktop selection + dialog in installation. +- 2.16.17 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.16.16.tar.bz2 New: ---- yast2-packager-2.16.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.Z13442/_old 2008-01-31 12:16:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Z13442/_new 2008-01-31 12:16:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.16.16) +# spec file for package yast2-packager (Version 2.16.18) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.16.16 -Release: 4 +Version: 2.16.18 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.16.16.tar.bz2 +Source0: yast2-packager-2.16.18.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # Progress::Subprogress*() @@ -65,7 +65,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.16.16 +%setup -n yast2-packager-2.16.18 %build %{prefix}/bin/y2tool y2autoconf @@ -102,6 +102,14 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Thu Jan 31 2008 locilka(a)suse.cz +- Reworked ProductLicense module to handle first-stage installation + license. +- 2.16.18 +* Tue Jan 29 2008 locilka(a)suse.cz +- Unified DefaultDesktop module and software/desktop selection + dialog in installation. +- 2.16.17 * Sun Jan 27 2008 coolo(a)suse.de - fixing changelog order * Fri Jan 25 2008 lslezak(a)suse.cz @@ -1232,7 +1240,7 @@ the [Details...] button possible. Leaving the old ones unchanged. - splitting displayed fingerprint with space after every 4th character -* Fri Apr 21 2006 jsrain(a)suse.de +* Sat Apr 22 2006 jsrain(a)suse.de - create 1st source as source containing base product (#160585) - 2.13.93 * Thu Apr 20 2006 mvidner(a)suse.cz @@ -1266,7 +1274,7 @@ - DirInstall - don't initialize the sources in the constructor, install the package callbacks in the dirinstall mode (#167281) - 2.13.85 -* Fri Apr 14 2006 jsrain(a)suse.de +* Sat Apr 15 2006 jsrain(a)suse.de - reverted displaying selected patterns in simple proposal (#162281) - 2.13.84 * Fri Apr 14 2006 mvidner(a)suse.cz @@ -1432,7 +1440,7 @@ * Mon Mar 20 2006 locilka(a)suse.cz - proper handling with data returned from Pkg::TargetGetDU() boolean -> integer (#159463) -* Thu Mar 16 2006 jsrain(a)suse.de +* Fri Mar 17 2006 jsrain(a)suse.de - provide function to initialize installation sources with visual feedback - 2.13.47 @@ -1452,7 +1460,7 @@ * Tue Mar 14 2006 visnov(a)suse.cz - disable sources on the target system for upgrade (#154850) - 2.13.44 -* Mon Mar 13 2006 jsrain(a)suse.de +* Tue Mar 14 2006 jsrain(a)suse.de - do not report void error during installation after reboot - fixed encodign the URL options (#155428) - 2.13.43 @@ -1505,7 +1513,7 @@ * Fri Feb 24 2006 jsuchome(a)suse.cz - added dialogs for ISO installation source - 2.13.34 -* Thu Feb 23 2006 jsrain(a)suse.de +* Fri Feb 24 2006 jsrain(a)suse.de - add support for patterns to proposal routines - 2.13.33 * Wed Feb 22 2006 jsrain(a)suse.de @@ -2604,7 +2612,7 @@ - InstURL: default directory to "/" - PackageCallbacks: remove bogus loop - 2.6.32 -* Sun Sep 08 2002 kkaempf(a)suse.de +* Mon Sep 09 2002 kkaempf(a)suse.de - pass correct locale to packagemanager - filter /etc/install.inf entries, linuxrc bug workaround - 2.6.31 @@ -2653,7 +2661,7 @@ * Thu Aug 29 2002 kkaempf(a)suse.de - Add directory to Url if not given by linuxrc - 2.6.18 -* Wed Aug 28 2002 kkaempf(a)suse.de +* Thu Aug 29 2002 kkaempf(a)suse.de - drop InstMedia, it's all in packagemanager now - 2.6.17 * Tue Aug 27 2002 kkaempf(a)suse.de ++++++ yast2-packager-2.16.16.tar.bz2 -> yast2-packager-2.16.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/configure new/yast2-packager-2.16.18/configure --- old/yast2-packager-2.16.16/configure 2008-01-22 15:31:23.000000000 +0100 +++ new/yast2-packager-2.16.18/configure 2008-01-18 13:29:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.16. +# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.15. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.16.16' -PACKAGE_STRING='yast2-packager 2.16.16' +PACKAGE_VERSION='2.16.15' +PACKAGE_STRING='yast2-packager 2.16.15' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.16.16 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.16.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.16.16:";; + short | recursive ) echo "Configuration of yast2-packager 2.16.15:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.16.16 +yast2-packager configure 2.16.15 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.16.16, which was +It was created by yast2-packager $as_me 2.16.15, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.16.16' + VERSION='2.16.15' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.16" +VERSION="2.16.15" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.16.16, which was +This file was extended by yast2-packager $as_me 2.16.15, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.16.16 +yast2-packager config.status 2.16.15 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/configure.in new/yast2-packager-2.16.18/configure.in --- old/yast2-packager-2.16.16/configure.in 2008-01-22 15:31:19.000000000 +0100 +++ new/yast2-packager-2.16.18/configure.in 2008-01-18 13:29:35.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.16.16, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.16.15, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.16" +VERSION="2.16.15" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/Makefile.in new/yast2-packager-2.16.18/Makefile.in --- old/yast2-packager-2.16.16/Makefile.in 2008-01-22 15:31:25.000000000 +0100 +++ new/yast2-packager-2.16.18/Makefile.in 2008-01-18 13:29:49.000000000 +0100 @@ -505,6 +505,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -531,6 +535,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -687,10 +693,10 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ + dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/packager.pot new/yast2-packager-2.16.18/packager.pot --- old/yast2-packager-2.16.16/packager.pot 2007-12-10 14:45:09.000000000 +0100 +++ new/yast2-packager-2.16.18/packager.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,218 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-10 13:33+0200\n" -"PO-Revision-Date: 2007-08-22 10:20+0200\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. explanation text for KDE -#: src/clients/inst_desktop.ycp:62 -msgid "" -"KDE is a powerful and intuitive desktop\n" -"environment that uses Kontact as its mailer,\n" -"Konqueror as its file manager, and offers\n" -"both Firefox and Konqueror as its Web browser." -msgstr "" -"KDE is a powerful and intuitive desktop\n" -"environment that uses Kontact as its mailer,\n" -"Konqueror as its file manager, and offers\n" -"both, Firefox and Konqueror as its Web browser." - -#. TRANSLATORS: popup header -#: src/clients/inst_productsources.ycp:124 -msgid "Network is not Configured" -msgstr "Network is not configured" - -#. TRANSLATORS: dialog help -#: src/clients/inst_productsources.ycp:426 -msgid "" -"Please wait, while packager is being initialized\n" -"and list of servers dowloaded from web." -msgstr "" -"Please wait, while packager is being initialized\n" -"and a list of servers dowloaded from web." - -#. TRANSLATORS: dialog help 1/3 -#: src/clients/inst_productsources.ycp:877 -msgid "" -"Here you can see default online repositories downloaded from Internet.\n" -"Click on the repository to see its details." -msgstr "" -"Here you can see default online repositories downloaded from the Internet.\n" -"Click on the repository to see its details." - -#. help, continued -#: src/clients/inst_source.ycp:545 -msgid "" -"\n" -"The CDs can be copied to the hard disk\n" -"Then use that as the repository.\n" -"Insert the path name where the first\n" -"CD is located, for example, /data1/CD1.\n" -"Only the base path is required if all CDs are copied\n" -"into one directory.\n" -"\n" -msgstr "" -"\n" -"The CDs can be copied to the hard disk\n" -"Then use it as the repository.\n" -"Insert the path name where the first\n" -"CD is located, for example, /data1/CD1.\n" -"Only the base path is required if all CDs are copied\n" -"into one directory.\n" -"\n" - -#. help, continued -#: src/clients/inst_source.ycp:567 -msgid "" -"\n" -"Synchronize Changes with ZENworks will call <tt>rug</tt>\n" -"to perform the changes also in that package management system." -msgstr "" -"\n" -"Synchronize changes with ZENworks will call <tt>rug</tt>\n" -"to perform the changes also in that package management system." - -#. popup message part 1 -#: src/clients/inst_source.ycp:621 -msgid "" -"Unable to save changes to repository\n" -"configuration." -msgstr "" -"Unable to save changes to the repository\n" -"configuration." - -#. Command line help text for the repository module, %1 is "zypper" -#: src/clients/inst_source.ycp:974 -msgid "Installation Repositories - this module doesn't support command line interface, use '%1' instead." -msgstr "Installation Repositories - this module does not support the command line interface, use '%1' instead." - -#: src/clients/sw_single.ycp:190 -msgid "There was an error in repository initialization." -msgstr "There was an error in the repository initialization." - -#. Command line help text for the software management module, %1 is "zypper" -#: src/clients/sw_single.ycp:473 -msgid "Software installation - this module doesn't support command line interface, use '%1' instead." -msgstr "Software installation - this module does not support the command line interface, use '%1' instead." - -#: src/modules/Packages.ycp:864 -msgid "Failed to integrate service pack repository." -msgstr "Failed to integrate the service pack repository." - -#. help text -#: src/modules/SourceDialogs.ycp:252 -msgid "" -"<big>Repository Name</big> \n" -"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." -msgstr "" -"<big>Repository Name</big> \n" -"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." - -#. error popup - the entered path is not a directory -#: src/modules/SourceDialogs.ycp:587 -msgid "" -"The entered path is not a directory\n" -"or the directory doesn't exist." -msgstr "" -"The entered path is not a directory\n" -"or the directory does not exist." - -#. error popup - the entered path is not a regular file -#: src/modules/SourceDialogs.ycp:614 -msgid "" -"The entered path is not a file\n" -"or the file doesn't exist." -msgstr "" -"The entered path is not a file\n" -"or the file does not exist." - -#. continue/cancel popup, %1 is a file name -#: src/modules/SourceDialogs.ycp:637 -msgid "" -"File '%1'\n" -"doesn't seem to be an ISO image.\n" -"Use it anyway?" -msgstr "" -"File '%1'\n" -"does not seem to be an ISO image.\n" -"Use it anyway?" - -#. help text - server dialog -#: src/modules/SourceDialogs.ycp:1039 -msgid "" -"<big>Server and Directory</big> \n" -"Use Server Name and Path to Directory or ISO Image\n" -"to specify the NFS server host name and path on the server.\n" -"To enable authentication, uncheck Anonymous and specify the\n" -"User Name and the Password.\n" -"\n" -"For SMB/CIFS repository, specify Share name and Path to Directory\n" -"or ISO Image. \n" -"If the location is a file holding an ISO image\n" -"of the media, set ISO Image." -msgstr "" -"<big>Server and Directory</big> \n" -"Use Server Name and Path to Directory or ISO Image\n" -"to specify the NFS server host name and path on the server.\n" -"To enable authentication, uncheck Anonymous and specify the\n" -"User Name and the Password.\n" -"\n" -"For the SMB/CIFS repository, specify Share name and Path to Directory\n" -"or ISO Image. \n" -"If the location is a file holding an ISO image\n" -"of the media, set ISO Image." - -#. help text - server dialog, there is a "Port" widget -#: src/modules/SourceDialogs.ycp:1050 -msgid "" -"It's possible to set the Port number for a HTTP/HTTPS repository.\n" -"Leave it empty to use the default port." -msgstr "" -"It is possible to set the Port number for a HTTP/HTTPS repository.\n" -"Leave it empty to use the default port." - -#: src/modules/SourceDialogs.ycp:1305 -msgid "" -"Download Files \n" -"Each repository has description files which describe content of the repository.\n" -"Check option Download repository description files to download the files\n" -"when closing this Yast module. If the option is unchecked Yast will\n" -"automatically download the files when it needs them later. " -msgstr "" -"Download Files \n" -"Each repository has description files which describe the content of the repository.\n" -"Check theDownload repository description files option to download the files\n" -"when closing this YaST module. If the option is unchecked YaST will\n" -"automatically download the files when it needs them later. " - -#. popup message header -#: src/modules/SourceManager.ycp:240 -msgid "" -"Unable to save changes to the repository\n" -" repository.\n" -msgstr "Unable to save changes to the repository.\n" - -#. message popup -#: src/modules/SourceManagerSLP.ycp:314 -msgid "" -"Please, select one of offered options.\n" -"This product has more repositories available." -msgstr "" -"Please select one of offered options.\n" -"This product has more repositories available." - -#. error popup -#: src/modules/SourceManagerSLP.ycp:508 -msgid "No SLP repositories have been found on your network." -msgstr "No SLP repositories have been found on your network." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/DefaultDesktop.ycp new/yast2-packager-2.16.18/src/modules/DefaultDesktop.ycp --- old/yast2-packager-2.16.16/src/modules/DefaultDesktop.ycp 2007-07-19 10:02:37.000000000 +0200 +++ new/yast2-packager-2.16.18/src/modules/DefaultDesktop.ycp 2008-01-29 17:48:55.000000000 +0100 @@ -14,6 +14,66 @@ import "ProductFeatures"; + +// Could be defined in control file +// @see GetAllDesktopsMap +map <string, map> all_desktops = $[ + "gnome" : $[ + "order" : 1, + // TRANSLATORS: Dialog label + "label" : _("GNOME Desktop"), + "patterns" : ["gnome", "x11", "base"], + "icon" : "pattern-gnome", + ], + "kde" : $[ + "order" : 1, + // TRANSLATORS: Dialog label + "label" : _("KDE Desktop"), + "patterns" : ["kde", "x11", "base"], + "icon" : "pattern-kde", + ], + "xfce" : $[ + "order" : 4, + // TRANSLATORS: Dialog label + "label" : _("XFCE Desktop"), + "patterns" : ["xfce", "x11", "base"], + "icon" : "yast-tv", + ], + "min_x" : $[ + "order" : 6, + // TRANSLATORS: Dialog label + "label" : _("Minimal X-Windows"), + "patterns" : ["x11", "base"], + "icon" : "yast-x11", + ], + "textmode" : $[ + "order" : 8, + // TRANSLATORS: Dialog label + "label" : _("Minimal Server Selection (Text Mode)"), + "patterns" : ["base"], + "icon" : "yast-sshd", + ], +]; + +/** + * Returns map of pre-defined default system tasks + * + * @return map <string, map> all_system_tasks + * + * @struct $[ + * "desktop ID" : $[ + * "order" : integer, + * "label" : _("Desktop Name Visible in Dialog"), + * "description" : _("Description text of the desktop"), + * "patterns" : ["list", "of", "related", "patterns"], + * "icon" : "some-icon", // filename from the 32x32 directory of the current theme (without .png suffix) + * ], + * ] + */ +global map <string, map> GetAllDesktopsMap () { + return all_desktops; +} + /** * Desktop which was selected in the desktop selection dialog * "kde", "gnome", "min_x11", "text" @@ -31,37 +91,6 @@ ]; /** - * Patterns to be preselected according to selected desktop - */ -map<string,list<string> > patterns_to_select = $[ - "gnome" : [ "gnome", "x11", "base" ], - "kde" : [ "kde", "x11", "base" ], - "min_x11" : [ "x11", "base" ], - "text" : [ "base" ], -]; - -/** - * Patterns NOT to be preselected according to selected desktop - */ -map<string,list<string> > patterns_to_deselect = $[ - "gnome" : [ "kde" ], - "kde" : [ "gnome" ], - "min_x11" : [ "kde, gnome" ], - "text" : [ "kde, gnome", "x11" ], -]; - -/** - * Map of desktop descriptions - */ -map<string,string> desktop_descr = $[ - "kde" : _("KDE"), - "gnome" : _("GNOME"), - "min_x11" : _("Minimal Graphical System"), - "text" : _("Text Mode"), -]; - - -/** * Get the currently set default desktop, nil if none set * @return string "kde", "gnome", "min_x11", "text", nil */ @@ -74,7 +103,7 @@ * @param desktop a string, one of "kde", "gnome", "min_x11", "text" or nil */ global void SetDesktop (string new_desktop) { - if (new_desktop != nil && ! haskey (desktop2wm, new_desktop)) + if (new_desktop != nil && ! haskey (all_desktops, new_desktop)) y2error ("Attempting to set desktop to unknown %1", new_desktop); else desktop = new_desktop; @@ -93,7 +122,7 @@ * @return a list of patterns */ global list<string> PatternsToSelect () { - return patterns_to_select[desktop]:[]; + return all_desktops[desktop, "patterns"]:[]; } /** @@ -101,7 +130,25 @@ * @return a list of patterns */ global list<string> PatternsToDeselect () { - return patterns_to_deselect[desktop]:[]; + // patterns which must be selected + list <string> patterns_to_select = PatternsToSelect(); + + list <string> patterns_to_deselect = []; + + // go through all known system task definitions + foreach (string one_desktop, map desktop_descr, all_desktops, { + // all patterns required by a system type + foreach (string one_pattern, desktop_descr["patterns"]:[], { + // if not required, add it to 'to deselect' + if (one_pattern != nil && ! contains (patterns_to_select, one_pattern)) { + patterns_to_deselect = add (patterns_to_deselect, one_pattern); + } + }); + }); + + y2milestone ("Patterns to deselect '%1' -> %2", desktop, patterns_to_deselect); + + return patterns_to_deselect; } /** @@ -109,7 +156,8 @@ * @return string the description of the desktop */ global string Description () { - return desktop_descr[desktop]:""; + // TRANSLATORS: dialog label + return all_desktops[desktop, "label"]:_("No system type selected"); } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/Packages.ycp new/yast2-packager-2.16.18/src/modules/Packages.ycp --- old/yast2-packager-2.16.16/src/modules/Packages.ycp 2008-01-17 10:27:17.000000000 +0100 +++ new/yast2-packager-2.16.18/src/modules/Packages.ycp 2008-01-29 17:48:55.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 43664 2008-01-16 14:25:15Z locilka $ + * $Id: Packages.ycp 43967 2008-01-29 13:17:41Z locilka $ */ { @@ -270,8 +270,8 @@ // (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) output = (list<string>)merge (output, ListSelected (`product, _("Product: %1"))); if (contains (flags, `desktop)) - // installation proposal - SW summary, %1 is name of the selected desktop (e.g. KDE) - output = (list<string>)add (output, sformat(_("Desktop: %1"), DefaultDesktop::Description ())); + // installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) + output = (list<string>)add (output, sformat(_("System Type: %1"), DefaultDesktop::Description ())); if (contains (flags, `pattern)) output = (list<string>) merge (output, ListSelected (`pattern, "+ %1")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/ProductLicense.ycp new/yast2-packager-2.16.18/src/modules/ProductLicense.ycp --- old/yast2-packager-2.16.16/src/modules/ProductLicense.ycp 2007-11-19 14:04:38.000000000 +0100 +++ new/yast2-packager-2.16.18/src/modules/ProductLicense.ycp 2008-01-30 16:53:56.000000000 +0100 @@ -96,7 +96,7 @@ return license_file; } -term GetLicenseContent (string lic_lang, map <string, string> & licenses) { +global term GetLicenseContent (string lic_lang, map <string, string> & licenses) { string license_file = WhichLicenceFile (lic_lang, licenses); string license_text = (string) SCR::Read(.target.string, license_file); @@ -117,19 +117,10 @@ // filename printed in the license dialog string license_file_print = nil; -/** - * Displays License with Help and ( ) Yes / ( ) No radio buttons - * @param string file with the license - */ -void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses) { +term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses) { string license_text = ""; - map display = UI::GetDisplayInfo(); - integer space = display["TextMode"]:true ? 1 : 3; term rt = GetLicenseContent (license_language, licenses); - // dialog caption - string caption = _("License Agreement"); - // bug #204791, no more "languages.ycp" client map<string,list> lang_names_orig = Language::GetLanguagesMap (false); if (lang_names_orig == nil) { @@ -193,16 +184,37 @@ return `item (`id (descr[0]:""), descr[1]:"", (descr[0]:"" == license_language)); }); + term lang_selector_options = `opt (`notify); + // Disable in case there is no language to select + // bugzilla #203543 + if (size (langs) <= 1) { + lang_selector_options = add (lang_selector_options, `disabled); + } + + return `VBox ( + // combo box + `Left (`ComboBox (`id (`lang), lang_selector_options, _("&Language"), + langs)), + `ReplacePoint (`id (`license_rp), rt) + ); +} + +/** + * Displays License with Help and ( ) Yes / ( ) No radio buttons + * @param string file with the license + */ +void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses) { + map display = UI::GetDisplayInfo(); + integer space = display["TextMode"]:true ? 1 : 3; + + // dialog caption + string caption = _("License Agreement"); + term contents = `VBox ( `VSpacing (1), `HBox ( `HSpacing (2*space), - `VBox ( - // combo box - `Left (`ComboBox (`id (`lang), `opt (`notify), _("&Language"), - langs)), - `ReplacePoint (`id (`license_rp), rt) - ), + GetLicenseDialogTerm (languages, license_language, licenses), `HSpacing (2*space) ), `VSpacing (2), @@ -253,11 +265,7 @@ Wizard::SetContents(caption, contents, help, back, false); - // bugzilla #203543 - if (size(langs) <= 1) { - UI::ChangeWidget (`id(`lang), `Enabled, false); - } - + Wizard::SetTitleIcon ("yast-license"); Wizard::SetFocusToNextButton(); } @@ -534,28 +542,10 @@ y2milestone ("ProductLicense settings: license_dir: %1, tmpdir: %2, info_file: %3", license_dir, tmpdir, info_file); } -/** - * Ask user to confirm license agreement - * @param src_id integer repository to get the license from - * @param dir string directory to look for the license in if src_id is nil - * and not 1st stage installation - * @param patterns a list of patterns for the files, regular expressions - * with %1 for the language - * @param boolean enable_back sets the back_button status - * @param boolean base_product defines whether it is a base or add-on product - * true means base product, false add-on product - * @param require_agreement means that even if the license (or the very same license) - * has been already accepetd, ask user to accept it again (because of 'going back' - * in the installation proposal). - */ -global symbol AskLicenseAgreement (integer src_id, string dir, - list<string> patterns, string action, boolean enable_back, - boolean base_product, boolean require_agreement) -{ - string lic_lang = ""; - map <string, string> licenses = $[]; - list <string> available_langs = []; +string lic_lang = ""; +symbol InitLicenseData (integer src_id, string dir, map <string, string> & licenses, + list <string> & available_langs, boolean require_agreement, string & license_ident) { GetSourceLicenseDirectory (src_id, dir); licenses = LicenseFiles (license_dir, @@ -638,46 +628,34 @@ if (src_id != nil) { // use wizard with steps if (Stage::initial()) { - Wizard::OpenNextBackStepsDialog(); - WorkflowManager::RedrawWizardSteps(); + // Wizard::OpenNextBackStepsDialog(); + // WorkflowManager::RedrawWizardSteps(); + y2milestone ("Initial stage, not opening any window..."); // use normal wizard } else { Wizard::OpenNextBackDialog(); } } - DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); - // Display info as a popup if exists - if (info_file != nil) - InstShowInfo::show_info_txt (info_file); + return `cont; +} - // initial loop - symbol ret = `first; +// Should have been named 'UpdateLicenseContentBasedOnSelectedLanguage' :-> +void UpdateLicenseContent (map <string, string> & licenses) { + // read the selected language + lic_lang = (string) UI::QueryWidget (`id (`lang), `Value); + UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses)); +} - // set timeout for autoinstallation - // bugzilla #206706 - boolean timeout = false; - if (Mode::autoinst()) { - timeout = true; - } +symbol HandleLicenseDialogRet (map <string, string> & licenses, boolean base_product, string action) { + symbol ret = nil; while (true) { - // bugzilla #206706 - if (timeout) { - sleep (2000); - y2milestone("AutoYaST: License has been accepted after timeout..."); - ret = `accepted; - break; - } - ret = (symbol) UI::UserInput(); if (ret == `lang) { - // read the selected language - lic_lang = (string) UI::QueryWidget (`id (`lang), `Value); - - UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses)); + UpdateLicenseContent (licenses); // bugzilla #303828 // disabled next button unless yes/no is selected } else if (ret == `yes || ret == `no) { @@ -786,6 +764,57 @@ } } + return ret; +} + +/** + * Ask user to confirm license agreement + * @param src_id integer repository to get the license from + * @param dir string directory to look for the license in if src_id is nil + * and not 1st stage installation + * @param patterns a list of patterns for the files, regular expressions + * with %1 for the language + * @param boolean enable_back sets the back_button status + * @param boolean base_product defines whether it is a base or add-on product + * true means base product, false add-on product + * @param require_agreement means that even if the license (or the very same license) + * has been already accepetd, ask user to accept it again (because of 'going back' + * in the installation proposal). + */ +global symbol AskLicenseAgreement (integer src_id, string dir, + list<string> patterns, string action, boolean enable_back, + boolean base_product, boolean require_agreement) +{ + lic_lang = ""; + map <string, string> licenses = $[]; + list <string> available_langs = []; + string license_ident = ""; + + symbol init_ret = InitLicenseData (src_id, dir, licenses, available_langs, require_agreement, license_ident); + + if (init_ret == `auto || init_ret == `accepted) { + y2milestone ("Returning %1", init_ret); + return init_ret; + } + + DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); + + // Display info as a popup if exists + if (info_file != nil) + InstShowInfo::show_info_txt (info_file); + + // initial loop + symbol ret = nil; + + // set timeout for autoinstallation + // bugzilla #206706 + if (Mode::autoinst()) { + y2milestone("AutoYaST: License has been accepted automatically"); + ret = `accepted; + } else { + ret = HandleLicenseDialogRet (licenses, base_product, action); + } + if (ret == `accepted && license_ident != nil) { // store already accepted license ID LicenseHasBeenAccepted (license_ident); @@ -794,7 +823,7 @@ CleanUpLicense (tmpdir); // bugzilla #303922 - if (src_id != nil) { + if (!Stage::initial() && src_id != nil) { Wizard::CloseDialog(); } @@ -824,6 +853,69 @@ enable_back, true, true); } +boolean info_file_already_seen = false; + +/** + * Called from the first stage Welcome dialog by clicking on a button + */ +global boolean ShowFullScreenLicenseInInstallation (any replace_point_ID) { + lic_lang = ""; + map <string, string> licenses = $[]; + list <string> available_langs = []; + string license_ident = ""; + + symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident); + + // Replaces the dialog content with Languages combo-box + // and the current license text (richtext) + UI::ReplaceWidget ( + `id (replace_point_ID), + GetLicenseDialogTerm (available_langs, lic_lang, licenses) + ); + + symbol ret = nil; + + while (true) + { + ret = (symbol) UI::UserInput(); + + if (ret == `lang) { + UpdateLicenseContent (licenses); + } else { + break; + } + } + + return true; +} + +/** + * Used in the first-stage Welcome dialog + */ +global boolean ShowLicenseInInstallation (any replace_point_ID) { + lic_lang = ""; + map <string, string> licenses = $[]; + list <string> available_langs = []; + string license_ident = ""; + + symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident); + + term rt = GetLicenseContent (lic_lang, licenses); + UI::ReplaceWidget (`id (replace_point_ID), rt); + + // Display info as a popup if exists + if (info_file != nil && ! info_file_already_seen) { + if (Mode::autoinst()) { + y2milestone ("Autoinstallation: Skipping info file..."); + } else { + InstShowInfo::show_info_txt (info_file); + info_file_already_seen = true; + } + } + + return true; +} + global symbol AskInstalledLicenseAgreement (string directory, list<string> patterns, string action) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/SourceDialogs.ycp new/yast2-packager-2.16.18/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.16.16/src/modules/SourceDialogs.ycp 2007-12-10 15:44:50.000000000 +0100 +++ new/yast2-packager-2.16.18/src/modules/SourceDialogs.ycp 2008-01-29 17:48:55.000000000 +0100 @@ -69,6 +69,23 @@ */ global void SetURL (string url) { _url = url; + + map parsed = URL::Parse(_url); + + // check if it's HDD or USB + // convert it to the internal representation + if (parsed["scheme"]:"" == "hd") + { + string query = parsed["query"]:""; + + if (regexpmatch(query, "device=/dev/disk/by-id/usb-")) + { + parsed["scheme"] = "usb"; + + _url = URL::Build (parsed); + y2milestone("URL %1 is an USB device, changing the scheme to %2", url, _url); + } + } } /** @@ -76,7 +93,24 @@ * @return string the URL */ global string GetURL () { - return _url; + map parsed = URL::Parse(_url); + y2internal("_url: %1, parse: %2", _url, parsed); + + // usb scheme is not valid, it's used only internally + // convert it for external clients + if (parsed["scheme"]:"" == "usb") + { + parsed["scheme"] = "hd"; + + if (parsed["path"]:"" == "") + { + parsed["path"] = "/"; + } + + string ret_url = URL::Build (parsed); + return ret_url; + } + else return _url; } /** @@ -241,7 +275,7 @@ "widget" : `custom, "custom_widget" : `VBox ( // text entry - `TextEntry( `id( `repo_name ), _("&Repository Name") ) + `InputField( `id( `repo_name ), _("&Repository Name") ) ), "init" : RepoNameInit, "store" : RepoNameStore, @@ -685,6 +719,332 @@ } +list<string> DetectPartitions(string disk_id) +{ + string command = sformat("ls %1-part*", disk_id); + + map out = (map)SCR::Execute(.target.bash_output, command); + + if (out["exit"]:-1 != 0) + { + y2error("Command %1 failed", command); + return []; + } + + list<string> ret = splitstring(out["stdout"]:"", "\n"); + integer ret_size = size(ret); + + // remove empty string at the end + if (ret_size > 0 && ret[ret_size - 1]:"dummy" == "") + { + ret = remove(ret, ret_size - 1); + } + + return ret; +} + +string GetDeviceID(list<string> devices) +{ + string ret = ""; + + foreach(string dev, devices, + { + if (regexpmatch(dev, "^/dev/disk/by-id/")) + { + ret = dev; + } + } + ); + + return ret; +} + +list<map<string,any> > DetectDisk(boolean usb_only) +{ + list<map> disks = (list<map>)SCR::Read(.probe.disk); + + y2internal("Detected disks: %1", disks); + + disks = filter(map disk, disks, + { + return ((disk["driver"]:"" == "usb-storage") && usb_only) + || ((disk["driver"]:"" != "usb-storage") && !usb_only); + } + ); + + y2internal("Filtered disks: %1", disks); + + list<map<string,any> > ret = []; + + foreach(map disk, disks, + { + string dev_id = GetDeviceID(disk["dev_names"]:[]); + + ret = add(ret, + $[ + "model" : disk["model"]:"", + // compute the size (number of sectors * size of sector) + "size" : (disk["resource","size",0,"x"]:0) * (disk["resource","size",0,"y"]:0), + "dev" : disk["dev_name"]:"", + "dev_by_id" : dev_id, + "partitions" : DetectPartitions(dev_id) + ] + ); + } + ); + + y2internal("Disk configuration: %1", ret); + + return ret; +} + +list<map<string,any> > DetectUSBDisk() +{ + return DetectDisk(true); +} + +list<map<string,any> > DetectHardDisk() +{ + return DetectDisk(false); +} + +list<term> DiskSelectionList(list<map<string,any> > disks, string selected) +{ + list<term> ret = []; + boolean found = false; + + foreach(map<string,any> disk, disks, + { + string label = disk["model"]:""; + + // add size if it's known and there is just one partition + // TODO detect size of each partition + integer sz = disk["size"]:0; + if (sz > 0 && size(disk["partitions"]:[]) == 1) + { + label = label + " - " + String::FormatSize(sz); + } + + string dev = disk["dev"]:""; + + foreach(string part, (list<string>)disk["partitions"]:[], + { + string partnum = regexpsub(part, ".*-part([0-9])*$", "\\1"); + string disk_label = label + sformat(" (%1%2)", dev, partnum); + found = found || (part == selected); + + ret = add(ret, `item(`id(part), disk_label, part == selected)); + } + ); + } + ); + + if (!found && regexpmatch(selected, "^/dev/disk/by-id/usb-")) + { + y2milestone("USB disk %1 is not currently attached, adding the raw device to the list", selected); + + // remove the /dev prefix + string dev_name = regexpsub(selected, "^/dev/disk/by-id/usb-(.*)", "\\1"); + ret = add(ret, `item(`id(selected), dev_name, true)); + } + + return ret; +} + + +void SetFileSystems(string selected_fs) +{ + list<string> fs_list = ["auto", "vfat", "ntfs", "ntfs-3g", "ext2", "ext3", "reiserfs", "xfs", "jfs", "iso9660"]; + + list<term> items = maplist(string fs, fs_list, + { + return `item(`id(fs), fs, fs == selected_fs); + } + ); + + UI::ChangeWidget(`id(`fs), `Items, items); +} + +map<string,string> ParseURLQuery(string query) +{ + list<string> qs = splitstring(query, "&"); + + map<string,string> ret = $[]; + + foreach(string q, qs, + { + list<string> parts = splitstring(q, "="); + + if (size(parts) != 2) + { + y2warning("Query doesn't contain a single '=' character: %1", q); + } + + ret[parts[0]:""] = parts[1]:""; + } + ); + + y2internal("Parsed query: %1", ret); + + return ret; +} + +// common code for USBInit() and DiskInit() +void InitDiskWidget(list<map<string,any> > disks) +{ + map parsed = URL::Parse(_url); + map<string,string> query = ParseURLQuery(parsed["query"]:""); + + UI::ChangeWidget(`id(`disk), `Items, DiskSelectionList(disks, query["device"]:"")); + + SetFileSystems(query["filesystem"]:"auto"); + + UI::ChangeWidget(`id(`dir), `Value, parsed["path"]:""); + UI::SetFocus (`disk); + +/* +FIXME: + // is it a plain directory? + boolean plain_rpm = (parsed["scheme"]:"" == "pkg"); + UI::ChangeWidget(`id(`ch_plain), `Value, plain_rpm); +*/ +} + +/** + * Init function of a widget + * @param key string widget key + */ +void USBInit (string key) { + // detect disks + list<map<string,any> > usb_disks = DetectUSBDisk(); + InitDiskWidget(usb_disks); +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void USBStore (string key, map event) { + + // build URL like this: usb:///openSUSE?device=/dev/sdb8&filesystem=auto + string query = sformat("device=%1&filesystem=%2", + (string)UI::QueryWidget (`id (`disk), `Value), + (string)UI::QueryWidget (`id (`fs), `Value)); + + string dir = (string)UI::QueryWidget (`id (`dir), `Value); + + map parsed = $[ + "scheme" : "usb", + "path" : dir, + "query" : query + ]; + + _url = URL::Build (parsed); + + y2milestone("New USB url: %1", _url); +} + + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> USBWidget () +{ + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + // combobox title + `ComboBox(`id (`disk), `opt(`hstretch), _("&USB Mass Storage Device") + // the spacing is added to make the widget wider + + " "), + `ComboBox(`id (`fs), `opt(`editable), _("&File System")), + `InputField(`id(`dir), _("Dire&ctory")) + ), + "init" : USBInit, + "store" : USBStore, + "help" : _("<big>USB Stick or Disk</big> +Select the USB device where the repository is located. +Use Path to Directory to specify the directory of the repository. +If the path is omitted the system will use the root directory of the disk. +If the directory contains just RPM packages without +any metadata (i.e. there is no product information) then check option +Plain RPM Directory.") + +// 'auto' is a value in the combo box widget, do not translate it! ++ _("The file system which is used on the device will be automatically +detected if file system 'auto' is selected. If the detection fails or a you +want to use a certain file system then select it from the list.") + ]; +} + +/** + * Init function of a widget + * @param key string widget key + */ +void DiskInit (string key) { + // refresh the cache + list<map<string,any> > disks = DetectHardDisk(); + InitDiskWidget(disks); +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void DiskStore (string key, map event) { + + // build URL like this: usb:///openSUSE?device=/dev/sdb8&filesystem=auto + string query = sformat("device=%1&filesystem=%2", + (string)UI::QueryWidget (`id (`disk), `Value), + (string)UI::QueryWidget (`id (`fs), `Value)); + + string dir = (string)UI::QueryWidget (`id (`dir), `Value); + + map parsed = $[ + "scheme" : "hd", + "path" : dir, + "query" : query + ]; + + _url = URL::Build (parsed); + + y2milestone("New Disk url: %1", _url); +} + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> DiskWidget () +{ + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + // combobox title + `ComboBox(`id (`disk), `opt(`hstretch), _("&Disk Device")), + `ComboBox(`id (`fs), `opt(`editable), _("&File System")), + `InputField(`id(`dir), _("Dire&ctory")) + ), + "init" : DiskInit, + "store" : DiskStore, + "help" : _("<big>Disk</big> +Select the disk where the repository is located. +Use Path to Directory to specify the directory of the repository. +If the path is omitted the system will use the root directory of the disk. +If the directory contains just RPM packages without +any metadata (i.e. there is no product information) then check option +Plain RPM Directory.") + +// 'auto' is a value in the combo box widget, do not translate it! ++ _("The file system which is used on the device will be automatically +detected if file system 'auto' is selected. If the detection fails or a you +want to use a certain file system then select it from the list.") + ]; +} + /** * Get widget description map * @return widget description map @@ -1133,6 +1493,10 @@ // radio button `Left (`RadioButton(`id(`dvd), _("&DVD..."))), // radio button + `Left (`RadioButton(`id(`hd), _("&Hard Disk..."))), + // radio button + `Left (`RadioButton(`id(`usb), _("&USB Mass Storage (USB Stick, Disk)..."))), + // radio button `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), // radio button `Left (`RadioButton(`id(`local_iso), _("&Local ISO Image..."))), @@ -1158,6 +1522,10 @@ // radio button `Left (`RadioButton(`id(`dvd), _("&DVD..."))), // radio button + `Left (`RadioButton(`id(`hd), _("&Hard Disk..."))), + // radio button + `Left (`RadioButton(`id(`usb), _("&USB Stick or Disk..."))), + // radio button `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), // radio button `Left (`RadioButton(`id(`local_iso), _("&Local ISO Image..."))), @@ -1235,6 +1603,16 @@ if (! SourceManager::AskForCD (msg)) return false; } + else if (selected == `usb) + { + list<map<string,any> > usb_disks = DetectUSBDisk(); + + if (size(usb_disks) == 0) + { + Report::Error(_("No USB disk was detected.")); + return false; + } + } return true; } @@ -1262,7 +1640,7 @@ _url = ""; _repo_name = ""; symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); - if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, + if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, `usb, `hd, `local_dir, `specify__url, `slp, `local_iso, `comm_repos], selected)) { if ( selected == `ftp ) _url = "ftp://"; @@ -1272,6 +1650,8 @@ else if ( selected == `nfs ) _url = "nfs://"; else if ( selected == `cd ) _url = "cd:///"; else if ( selected == `dvd ) _url = "dvd:///"; + else if ( selected == `hd ) _url = "hd://"; + else if ( selected == `usb ) _url = "usb://"; else if ( selected == `local_dir ) _url = "dir://"; else if ( selected == `local_iso ) _url = "file://"; else if ( selected == `slp ) _url = "slp://"; @@ -1290,6 +1670,8 @@ else if ( _url == "nfs://" ) current = `nfs; else if ( _url == "cd:///" ) current = `cd; else if ( _url == "dvd:///" ) current = `dvd; + else if ( _url == "hd://" ) current = `hd; + else if ( _url == "usb://" ) current = `usb; else if ( _url == "dir://" ) current = `local_dir; else if ( _url == "file://" ) current = `local_iso; else if ( _url == "slp://" ) current = `slp; @@ -1375,6 +1757,8 @@ "nfs" : NFSWidget (), "cd" : CDWidget (), "dvd" : CDWidget (), + "hd" : DiskWidget (), + "usb" : USBWidget (), "dir" : DirWidget (), "file" : IsoWidget (), "pkg" : DirWidget(), @@ -1402,6 +1786,10 @@ // label / dialog caption "dvd" : _("CD or DVD Media"), // label / dialog caption + "hd" : _("Hard Disk"), + // label / dialog caption + "usb" : _("USB Stick or Disk"), + // label / dialog caption "dir" : _("Local Directory"), // label / dialog caption "file" : _("Local ISO Image"), @@ -1446,8 +1834,7 @@ */ global string EditPopup (string url) { SetURL (url); - string proto = URLScheme (url); - map parsed_url = URL::Parse(url); + string proto = URLScheme (_url); y2milestone ("Displaying popup for protocol %1", proto); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/VERSION new/yast2-packager-2.16.18/VERSION --- old/yast2-packager-2.16.16/VERSION 2008-01-22 15:30:38.000000000 +0100 +++ new/yast2-packager-2.16.18/VERSION 2008-01-31 11:21:09.000000000 +0100 @@ -1 +1 @@ -2.16.16 +2.16.18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-installation checked in at Thu Jan 31 12:16:23 CET 2008. -------- --- yast2-installation/yast2-installation.changes 2008-01-30 15:33:04.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-01-31 11:19:26.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 11:14:46 CET 2008 - locilka(a)suse.cz + +- Added docu. for *_finish scripts (needed for FATE #302980). +- Welcome dialog can newly show the license according to the just + selected language and also show other lozalizations if needed. +- 2.16.13 + +------------------------------------------------------------------- @@ -4,0 +13 @@ +- 2.16.12 Old: ---- yast2-installation-2.16.12.tar.bz2 New: ---- yast2-installation-2.16.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.m12177/_old 2008-01-31 12:16:17.000000000 +0100 +++ /var/tmp/diff_new_pack.m12177/_new 2008-01-31 12:16:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.12) +# spec file for package yast2-installation (Version 2.16.13) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.16.12 +Version: 2.16.13 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.12.tar.bz2 +Source0: yast2-installation-2.16.13.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # Mode::live_installation @@ -31,7 +31,8 @@ # Newly created RPM Requires: yast2-country-data >= 2.16.3 # New System-selection data and API DefaultDesktop module -Requires: yast2-packager >= 2.16.17 +# New API in ProductLicense +Requires: yast2-packager >= 2.16.18 # Only in inst-sys # Requires: yast2-runlevel # Requires: yast2-network @@ -70,12 +71,12 @@ Summary: YaST2 - Installation Parts %package devel-doc -Version: 2.16.12 +Version: 2.16.13 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.12.tar.bz2 +Source0: yast2-installation-2.16.13.tar.bz2 Prefix: /usr Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq @@ -108,7 +109,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.16.12 +%setup -n yast2-installation-2.16.13 %build %{prefix}/bin/y2tool y2autoconf @@ -173,9 +174,16 @@ %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README + %changelog +* Thu Jan 31 2008 locilka(a)suse.cz +- Added docu. for *_finish scripts (needed for FATE #302980). +- Welcome dialog can newly show the license according to the just + selected language and also show other lozalizations if needed. +- 2.16.13 * Wed Jan 30 2008 aschnell(a)suse.de - Use icewm instead of fvwm during installation (bnc #357240) +- 2.16.12 * Wed Jan 30 2008 fehr(a)suse.de - Add installation step for disk partitioning between time zone and software selection ++++++ yast2-installation-2.16.12.tar.bz2 -> yast2-installation-2.16.13.tar.bz2 ++++++ ++++ 2741 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.12/configure.in new/yast2-installation-2.16.13/configure.in --- old/yast2-installation-2.16.12/configure.in 2008-01-30 15:32:22.000000000 +0100 +++ new/yast2-installation-2.16.13/configure.in 2008-01-14 13:56:46.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.16.12, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.16.9, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.12" +VERSION="2.16.9" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.12/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.16.13/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.16.12/src/clients/inst_complex_welcome.ycp 2008-01-30 15:26:00.000000000 +0100 +++ new/yast2-installation-2.16.13/src/clients/inst_complex_welcome.ycp 2008-01-30 10:29:36.000000000 +0100 @@ -40,8 +40,9 @@ import "Wizard"; import "Icon"; import "InstData"; + import "ProductLicense"; - string language = Language::language; + string language = Language::language; /** * check if selected language has support on media (F301238) @@ -69,30 +70,6 @@ } } - -/* - define void update_adapt_term () { - - string kb = Keyboard::GetKeyboardForLanguage (language, "english-us"); - string tz = Timezone::GetTimezoneForLanguage (language, "US/Mountain"); - - string kbd_name = Keyboard::Selection ()[kb]:""; - string tmz_name = Timezone::GetTimezoneCountry (tz); - - UI::ReplaceWidget (`id(`rpadapt), `VBox ( - `Left (`CheckBox (`id (`adapt_kbd), - // check box label (%1 is keyboard layout name) - sformat(_("Adapt &Keyboard Layout to %1"),kbd_name))), - `Left (`CheckBox (`id (`adapt_tmz), - // check box label (%1 is country name) - sformat (_("Adapt &Time Zone to %1"), tmz_name))) - )); - - UI::ChangeWidget(`id(`adapt_kbd),`Enabled, kb != Keyboard::current_kbd); - UI::ChangeWidget(`id(`adapt_tmz),`Enabled, tz != Timezone::timezone); - } -*/ - // ------------------------------------- main part of the client ----------- map argmap = GetInstArgs::argmap(); @@ -106,17 +83,6 @@ string preselected = Language::preselected; - if (preselected != "en_US" && set_default) - { - if (ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog")) - { - y2milestone("Skipping language dialog, Language changed to %1",preselected); - check_languages_support (preselected); - Language::selection_skipped = true; - return `auto; - } - } - list<string>languages = splitstring (Language::languages, ","); // filter the primary language from the list of secondary ones: @@ -130,7 +96,7 @@ // set up selection list with default item - boolean use_ascii = Language::GetTextMode (); + boolean text_mode = Language::GetTextMode (); /* ---------------------------------------------------------------------- * Build dialog @@ -149,7 +115,7 @@ string key = lang_info [1]:lang_code; return $[ key : [ - lang_info[use_ascii ? 1 : 0]:"", + lang_info[text_mode ? 1 : 0]:"", lang_code, lang_info[2]:key ] @@ -228,14 +194,43 @@ `HSquash ( `VBox ( `Left (`Label (`opt(`boldFont), _("License Agreement"))), - `Left (`Label (_("License agreement is missing here. -It will be added soon."))), - `Left (`CheckBox (`id (`license_agreement), `opt (`notify), _("I Do &Agree to the License Terms."), InstData::product_license_accepted)) + `HSquash(`MinSize ( + 60, + (text_mode ? 9:13), + `Left (`ReplacePoint (`id (`base_license_rp), `Empty())) + )), + `VSpacing (text_mode ? 0.1 : 0.5), + `HBox ( + `Left (`CheckBox ( + // TRANSLATORS: check-box + `id (`license_agreement), `opt (`notify), _("I Do &Agree to the License Terms."), InstData::product_license_accepted + )), + `VStretch (), + // TRANSLATORS: button label + `Right (`PushButton (`id (`show_fulscreen_license), _("Show In Full-Screen..."))) + ) ) ), `VWeight (3, `VStretch()) ); + term FullScreenLicenseDialog () { + return `VBox ( + `Left (`HBox ( + Icon::Simple ("yast-license"), + // TRANSLATORS: dialog caption + `Heading (_("License Agreement")) + )), + `VSpacing (text_mode ? 0.1 : 0.5), + `HSpacing (60), + `MinHeight ( + (text_mode ? 20 : 25), + `ReplacePoint (`id (`full_screen_license_rp), `Empty()) + ), + `PushButton (`id (`close), Label::OKButton()) + ); + } + string help_text = ""; // help text (language dependent packages) - at the end of help string packages_help = _(" @@ -412,6 +407,13 @@ return false; } + ProductLicense::ShowLicenseInInstallation (`base_license_rp); + + // bugzilla #206706 + if (Mode::autoinst()) { + return `auto; + } + while (true) { ret = UI::UserInput(); y2milestone ("UserInput() returned %1", ret); @@ -450,6 +452,10 @@ } if (ret == `next) break; + } else if (ret == `show_fulscreen_license) { + UI::OpenDialog (FullScreenLicenseDialog()); + ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp); + UI::CloseDialog(); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.12/VERSION new/yast2-installation-2.16.13/VERSION --- old/yast2-installation-2.16.12/VERSION 2008-01-30 15:26:01.000000000 +0100 +++ new/yast2-installation-2.16.13/VERSION 2008-01-31 11:21:47.000000000 +0100 @@ -1 +1 @@ -2.16.12 +2.16.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0