Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit yast2
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 12 Jun 2007 18:42:52 +0200
- Message-id: <20070612164252.7DF90678183@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2
checked in at Tue Jun 12 18:42:52 CEST 2007.
--------
--- yast2/yast2.changes 2007-06-01 09:53:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-06-12 18:09:22.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Jun 12 18:05:51 CEST 2007 - mzugec@xxxxxxx
+
+- fixed CheckDomain function - allow "." character at the end
+of domain name (suse.cz.)
+- 2.15.36
+
+-------------------------------------------------------------------
+Thu Jun 7 10:14:06 CEST 2007 - lslezak@xxxxxxx
+
+- speed up PackageSystem::InstallKernel() - call rpm directly
+ instead of starting the package manager
+- display licenses in the command line mode properly,
+ fixed prompt when removing packages (#270910)
+
+-------------------------------------------------------------------
+Tue Jun 5 21:22:50 CEST 2007 - locilka@xxxxxxx
+
+- Extended PackageLock::Check function to allow to 'Retry' getting
+ the package management lock (#280383).
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.35.tar.bz2
New:
----
yast2-2.15.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.mI4384/_old 2007-06-12 18:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.mI4384/_new 2007-06-12 18:40:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.35)
+# spec file for package yast2 (Version 2.15.36)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.15.35
+Version: 2.15.36
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.35.tar.bz2
+Source0: yast2-2.15.36.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite
# SCR::RegisterNewAgents()
@@ -101,7 +101,7 @@
Steffen Winterfeldt <snwint@xxxxxxx>
%prep
-%setup -n yast2-2.15.35
+%setup -n yast2-2.15.36
%build
%{prefix}/bin/y2tool y2autoconf
@@ -206,6 +206,18 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Jun 12 2007 - mzugec@xxxxxxx
+- fixed CheckDomain function - allow "." character at the end
+ of domain name (suse.cz.)
+- 2.15.36
+* Thu Jun 07 2007 - lslezak@xxxxxxx
+- speed up PackageSystem::InstallKernel() - call rpm directly
+ instead of starting the package manager
+- display licenses in the command line mode properly,
+ fixed prompt when removing packages (#270910)
+* Tue Jun 05 2007 - locilka@xxxxxxx
+- Extended PackageLock::Check function to allow to 'Retry' getting
+ the package management lock (#280383).
* Fri Jun 01 2007 - mzugec@xxxxxxx
- add function NetworkService::isNetworkRunning()
- NetworkStorage moved here from yast2-network
++++++ yast2-2.15.35.tar.bz2 -> yast2-2.15.36.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/configure new/yast2-2.15.36/configure
--- old/yast2-2.15.35/configure 2007-06-01 09:28:40.000000000 +0200
+++ new/yast2-2.15.36/configure 2007-06-12 18:07:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2 2.15.34.
+# Generated by GNU Autoconf 2.60 for yast2 2.15.36.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.15.34'
-PACKAGE_STRING='yast2 2.15.34'
+PACKAGE_VERSION='2.15.36'
+PACKAGE_STRING='yast2 2.15.36'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,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 2.15.34 to adapt to many kinds of systems.
+\`configure' configures yast2 2.15.36 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.15.34:";;
+ short | recursive ) echo "Configuration of yast2 2.15.36:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.15.34
+yast2 configure 2.15.36
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,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 $as_me 2.15.34, which was
+It was created by yast2 $as_me 2.15.36, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.15.34'
+ VERSION='2.15.36'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.34"
+VERSION="2.15.36"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"
@@ -3366,7 +3366,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.15.34, which was
+This file was extended by yast2 $as_me 2.15.36, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3409,7 +3409,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.15.34
+yast2 config.status 2.15.36
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/configure.in new/yast2-2.15.36/configure.in
--- old/yast2-2.15.35/configure.in 2007-06-01 09:28:36.000000000 +0200
+++ new/yast2-2.15.36/configure.in 2007-06-12 18:07:48.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.15.34, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.36, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.34"
+VERSION="2.15.36"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/library/modules/Version.ycp new/yast2-2.15.36/library/modules/Version.ycp
--- old/yast2-2.15.35/library/modules/Version.ycp 2007-06-01 09:53:00.000000000 +0200
+++ new/yast2-2.15.36/library/modules/Version.ycp 2007-06-12 18:08:03.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.35";
+global string yast2 = "2.15.36";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/library/packages/src/common.ycp new/yast2-2.15.36/library/packages/src/common.ycp
--- old/yast2-2.15.35/library/packages/src/common.ycp 2007-03-12 09:51:40.000000000 +0100
+++ new/yast2-2.15.36/library/packages/src/common.ycp 2007-06-07 22:01:18.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Vidner <mvidner@xxxxxxx>
* Michal Svec <msvec@xxxxxxx>
*
- * $Id: common.ycp 36445 2007-02-23 12:01:29Z lslezak $
+ * $Id: common.ycp 38335 2007-06-07 10:46:58Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -106,10 +106,11 @@
return which != nil;
}
-boolean AskPackages(list<string> packs) {
+boolean AskPackages(list<string> packs, boolean install) {
string pkgs = mergestring(packs, ", ");
// the message is followed by list of required packages
- string text = _("These packages need to be installed:") + " " + pkgs;
+ string text = (install ? _("These packages need to be installed:") : _("These packages need to be removed:"))
+ + " " + pkgs;
CommandLine::Print(text);
return CommandLine::YesNo();
@@ -142,7 +143,7 @@
if (message != nil)
text = sformat (message, mergestring (packs, ", "));
- boolean doit = (Mode::commandline()) ? (CommandLine::Interactive() ? AskPackages(packs) : true ) : Popup::AnyQuestionRichText(
+ boolean doit = (Mode::commandline()) ? (CommandLine::Interactive() ? AskPackages(packs, install) : true ) : Popup::AnyQuestionRichText(
"", text, 40, 10,
Label::ContinueButton (), Label::CancelButton (),
`focus_yes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/library/packages/src/PackageLock.ycp new/yast2-2.15.36/library/packages/src/PackageLock.ycp
--- old/yast2-2.15.35/library/packages/src/PackageLock.ycp 2006-12-11 13:16:08.000000000 +0100
+++ new/yast2-2.15.36/library/packages/src/PackageLock.ycp 2007-06-07 22:01:18.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Packages manipulation (system)
* Authors: Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: PackageLock.ycp 33224 2006-10-02 14:17:13Z jsrain $
+ * $Id: PackageLock.ycp 38304 2007-06-05 19:24:53Z locilka $
*
* This should be used everywhere before Pkg is first used. #160319
*/
@@ -14,9 +14,11 @@
module "PackageLock";
textdomain "base";
-import "Report";
+import "Popup";
+import "Label";
boolean have_lock = nil;
+
/**
* Tries to acquire the packager (zypp) lock.
* Reports an error if another process has the lock already.
@@ -24,18 +26,40 @@
* @return true if we can continue
*/
global boolean Check () {
- if (have_lock == nil)
- {
+ // we already have a lock
+ if (have_lock != nil) return have_lock;
+
+ // just to allow 'Retry', see more in bug #280383
+ boolean try_again = true;
+
+ // while not having a lock and user wants to try again
+ while (try_again) {
// Invoke a cheap call that accesses the zypp lock
have_lock = Pkg::Connect () == true; // nil guard
- if (!have_lock)
- {
- Report::Error (_("Another process is accessing the package database.
+ if (have_lock == true) break;
+
+ if (have_lock != true) {
+ try_again = (Popup::AnyQuestion (
+ // TRANSLATORS: a popup headline
+ _("Accessing the Package Management Failed"),
+ // TRANSLATORS: an error message with question
+ _("Another process is accessing the package database.
Package management cannot be used now.
-"));
- // ContinueCancel? What about CLI?
+
+Would you like to continue without having access
+to the package management or retry to access it?
+"),
+ Label::ContinueButton(),
+ Label::RetryButton(),
+ // 'Continue' instead of 'Retry'
+ `focus_yes
+ ) == false);
}
+
+ if (try_again) y2milestone ("User decided to retry...");
}
+
+ y2milestone ("PackageLock::Check result: %1", have_lock);
return have_lock;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/library/packages/src/PackageSystem.ycp new/yast2-2.15.36/library/packages/src/PackageSystem.ycp
--- old/yast2-2.15.35/library/packages/src/PackageSystem.ycp 2007-03-12 09:51:40.000000000 +0100
+++ new/yast2-2.15.36/library/packages/src/PackageSystem.ycp 2007-06-07 22:01:18.000000000 +0200
@@ -6,7 +6,7 @@
* Michal Svec <msvec@xxxxxxx>
* Flags: Stable
*
- * $Id: PackageSystem.ycp 36639 2007-03-02 08:10:36Z lslezak $
+ * $Id: PackageSystem.ycp 38335 2007-06-07 10:46:58Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -123,9 +123,27 @@
if (size (licenses) > 0)
{
list<string> rt_licenses_l = maplist ( string p, string l, licenses, {
- return sformat ("<p><b>%1</b></p>\n%2", p, l);
+ return Mode::commandline()
+ ? sformat ("%1\n%2", p, l)
+ : sformat ("<p><b>%1</b></p>\n%2", p, l);
});
- if (! Popup::AnyQuestionRichText (
+
+ boolean accepted = false;
+
+ if (Mode::commandline())
+ {
+ // print the licenses
+ CommandLine::Print(mergestring (rt_licenses_l, "\n"));
+ // print the question
+ CommandLine::Print(_("Do you accept this license agreement?",
+ "Do you accept these license agreements?",
+ size (licenses)));
+
+ accepted = !CommandLine::YesNo();
+ }
+ else
+ {
+ accepted = !Popup::AnyQuestionRichText (
// popup heading, with rich text widget and Yes/No buttons
_("Do you accept this license agreement?",
"Do you accept these license agreements?",
@@ -133,19 +151,26 @@
mergestring (rt_licenses_l, "\n"),
70, 20,
Label::YesButton (), Label::NoButton (),
- `focus_none))
+ `focus_none);
+ }
+
+ y2milestone("Licenses accepted: %1", accepted);
+
+ if (!accepted)
{
y2milestone("License not accepted: %1", toinstall);
last_op_canceled = true;
return false;
}
+
+ // mark licenses as confirmed
foreach (string p, string l, licenses, {
Pkg::PkgMarkLicenseConfirmed (p);
});
last_op_canceled = false;
}
- // check if the database os consistent before packages were added
+ // check if the database is consistent before packages are added
boolean packages_consistent = Pkg::PkgSolveCheckTargetOnly();
foreach (string p, toinstall, {
@@ -322,6 +347,32 @@
return true; // nothing to do
}
+ // check whether tag "kernel" is provided
+ // do not initialize the package manager if it's not necessary
+ string rpm_command = "/bin/rpm -q --whatprovides kernel";
+ y2milestone("Starting RPM query: %1", rpm_command);
+ map output = (map)SCR::Execute(.target.bash_output, rpm_command);
+ y2debug("result of the query: %1", output);
+
+ if (output["exit"]:-1 == 0)
+ {
+ list<string> packages = splitstring(output["stdout"]:"", "\n");
+ packages = filter(string pkg, packages, {return pkg != "";});
+ y2milestone("Packages providing tag 'kernel': %1", packages);
+
+ if (size(packages) > 0)
+ {
+ return true;
+ }
+
+ y2milestone("Huh? Kernel is not installed??");
+ }
+ else
+ {
+ y2warning("RPM query failed, quering the package manager...");
+ }
+
+
EnsureTargetInit ();
list <list> provides = Pkg::PkgQueryProvides ("kernel");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/library/types/src/Hostname.ycp new/yast2-2.15.36/library/types/src/Hostname.ycp
--- old/yast2-2.15.35/library/types/src/Hostname.ycp 2006-12-11 13:16:04.000000000 +0100
+++ new/yast2-2.15.36/library/types/src/Hostname.ycp 2007-06-12 18:06:53.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Flags: Stable
*
- * $Id: Hostname.ycp 31242 2006-06-01 12:59:16Z locilka $
+ * $Id: Hostname.ycp 38417 2007-06-12 16:06:47Z mzugec $
*/
{
@@ -73,6 +73,10 @@
*/
global define boolean CheckDomain(string domain) ``{
if (domain == nil || domain == "") return false;
+ // if "domain" contains "." character as last character remove it before validation (but it's valid)
+ if (size(domain)>1){
+ if (substring(domain, size(domain)-1, 1)==".") domain = substring(domain, 0, size(domain)-1);
+ }
list <string> l = splitstring(domain, ".");
if (contains (maplist(string h, l, ``(Check(h))), false)) return false;
return !regexpmatch (domain, "\\.[[:digit:]][^.]*$");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/library/types/testsuite/tests/Hostname.out new/yast2-2.15.36/library/types/testsuite/tests/Hostname.out
--- old/yast2-2.15.35/library/types/testsuite/tests/Hostname.out 2006-12-11 13:16:05.000000000 +0100
+++ new/yast2-2.15.36/library/types/testsuite/tests/Hostname.out 2007-06-12 17:59:49.000000000 +0200
@@ -21,7 +21,7 @@
Dump Hostname::CheckDomain
Return false
Return false
-Return false
+Return true
Return false
Return false
Return false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.35/VERSION new/yast2-2.15.36/VERSION
--- old/yast2-2.15.35/VERSION 2007-06-01 09:51:06.000000000 +0200
+++ new/yast2-2.15.36/VERSION 2007-06-12 18:05:50.000000000 +0200
@@ -1 +1 @@
-2.15.35
+2.15.36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |