Hello community,
here is the log from the commit of package yast2-instserver
checked in at Tue Oct 14 19:30:06 CEST 2008.
--------
--- yast2-instserver/yast2-instserver.changes 2008-09-10 10:53:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-instserver/yast2-instserver.changes 2008-10-14 16:23:29.504717000 +0200
@@ -1,0 +2,8 @@
+Tue Oct 14 16:15:38 CEST 2008 - lslezak@suse.cz
+
+- fixed adding of a removed repository - do not remove the new
+ repository at the and, remove it immediately (bnc#187280)
+- support for SLES8 sources (bnc#265858)
+- 2.17.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-instserver-2.17.1.tar.bz2
New:
----
yast2-instserver-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.s24307/_old 2008-10-14 19:29:17.000000000 +0200
+++ /var/tmp/diff_new_pack.s24307/_new 2008-10-14 19:29:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.17.1)
+# spec file for package yast2-instserver (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.com/
Name: yast2-instserver
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-instserver-2.17.1.tar.bz2
+Source0: yast2-instserver-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
# ag_content agent
@@ -47,7 +47,7 @@
Anas Nashif
%prep
-%setup -n yast2-instserver-2.17.1
+%setup -n yast2-instserver-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,8 +82,12 @@
/etc/apache2/conf.d/inst_server.conf.in
%dir /etc/apache2
%dir /etc/apache2/conf.d
-
%changelog
+* Tue Oct 14 2008 lslezak@suse.cz
+- fixed adding of a removed repository - do not remove the new
+ repository at the and, remove it immediately (bnc#187280)
+- support for SLES8 sources (bnc#265858)
+- 2.17.2
* Wed Sep 10 2008 lslezak@suse.cz
- merged proofread texts (2008-09-08)
- 2.17.1
++++++ yast2-instserver-2.17.1.tar.bz2 -> yast2-instserver-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.1/configure new/yast2-instserver-2.17.2/configure
--- old/yast2-instserver-2.17.1/configure 2008-09-10 10:52:34.000000000 +0200
+++ new/yast2-instserver-2.17.2/configure 2008-10-14 16:22:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-instserver 2.17.1.
+# Generated by GNU Autoconf 2.61 for yast2-instserver 2.17.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-instserver'
PACKAGE_TARNAME='yast2-instserver'
-PACKAGE_VERSION='2.17.1'
-PACKAGE_STRING='yast2-instserver 2.17.1'
+PACKAGE_VERSION='2.17.2'
+PACKAGE_STRING='yast2-instserver 2.17.2'
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-instserver 2.17.1 to adapt to many kinds of systems.
+\`configure' configures yast2-instserver 2.17.2 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-instserver 2.17.1:";;
+ short | recursive ) echo "Configuration of yast2-instserver 2.17.2:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-instserver configure 2.17.1
+yast2-instserver configure 2.17.2
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-instserver $as_me 2.17.1, which was
+It was created by yast2-instserver $as_me 2.17.2, 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-instserver'
- VERSION='2.17.1'
+ VERSION='2.17.2'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.1"
+VERSION="2.17.2"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
@@ -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-instserver $as_me 2.17.1, which was
+This file was extended by yast2-instserver $as_me 2.17.2, 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-instserver config.status 2.17.1
+yast2-instserver config.status 2.17.2
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-instserver-2.17.1/configure.in new/yast2-instserver-2.17.2/configure.in
--- old/yast2-instserver-2.17.1/configure.in 2008-09-10 10:52:29.000000000 +0200
+++ new/yast2-instserver-2.17.2/configure.in 2008-10-14 16:22:10.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-instserver, 2.17.1, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.17.2, http://bugs.opensuse.org/, yast2-instserver)
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.17.1"
+VERSION="2.17.2"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.1/src/dialogs.ycp new/yast2-instserver-2.17.2/src/dialogs.ycp
--- old/yast2-instserver-2.17.1/src/dialogs.ycp 2008-07-30 09:18:01.000000000 +0200
+++ new/yast2-instserver-2.17.2/src/dialogs.ycp 2008-10-14 16:19:04.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 49500 2008-07-30 07:18:00Z lslezak $
+ * $Id: dialogs.ycp 52185 2008-10-14 14:19:03Z lslezak $
*/
{
@@ -17,6 +17,7 @@
import "Wizard";
import "Instserver";
import "CWMFirewallInterfaces";
+ import "String";
include "instserver/helps.ycp";
include "instserver/routines.ycp";
@@ -163,7 +164,9 @@
// SLES or CORE == 9
((product_lower == "suse sles" || product_lower == "suse core") && version == 900) ||
(product_lower == "suse sles 9 service-pack")
- || (product_lower == "open enterprise server" && version == 0))
+ || (product_lower == "open enterprise server" && version == 0)
+ || (product_lower == "suse sles" && version <= 800)
+ )
{
ret = false;
}
@@ -1137,6 +1140,44 @@
}
}
+ // check if the repository has been already removed (bnc#187280)
+ if (contains(Instserver::to_delete, dir))
+ {
+ y2milestone("Repository %1 has been marked to delete", dir);
+
+ // confirm removal of a repository, the action is done immediately and cannot be reverted
+ string confirm = sformat(_("Repository '%1' has been marked to delete.
+When adding a new repository with the same name
+the old content must deleted right now.
+
+Really delete the old content and create it from cratch?"), dir);
+
+ if (Popup::YesNo(confirm))
+ {
+ y2milestone("Removing the old repository");
+ string rmdir = Instserver::ServerSettings["directory"]:"" + "/" + dir;
+ string rm = sformat("rm -rf '%1'", String::Quote(rmdir));
+
+ y2milestone("Executing: %1", rm);
+ SCR::Execute(.target.bash, rm);
+
+ // remove it from to_delete list, it has just been deleted
+ Instserver::to_delete = filter(string del, Instserver::to_delete,
+ {
+ return del != dir;
+ }
+ );
+
+ y2milestone("Updated list of removed repositories: %1", Instserver::to_delete);
+ }
+ else
+ {
+ y2milestone("Not removing the old repository");
+ continue;
+ }
+ }
+
+
if (dir != Instserver::Config["name"]:"" && Instserver::Config["name"]:"" != "")
{
// mark the directory content for moving at write
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.17.1/VERSION new/yast2-instserver-2.17.2/VERSION
--- old/yast2-instserver-2.17.1/VERSION 2008-09-10 10:49:54.000000000 +0200
+++ new/yast2-instserver-2.17.2/VERSION 2008-10-14 16:18:22.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org