Hello community,
here is the log from the commit of package yast2-online-update
checked in at Mon Feb 25 16:59:05 CET 2008.
--------
--- yast2-online-update/yast2-online-update.changes 2007-12-17 13:09:33.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2008-02-21 12:50:03.146351000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 21 12:41:45 CET 2008 - jsuchome@suse.cz
+
+- do not add same source twice (#272666)
+- 2.16.7
+
+-------------------------------------------------------------------
Old:
----
yast2-online-update-2.16.6.tar.bz2
New:
----
yast2-online-update-2.16.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.K12395/_old 2008-02-25 16:58:47.000000000 +0100
+++ /var/tmp/diff_new_pack.K12395/_new 2008-02-25 16:58:47.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-online-update (Version 2.16.6)
+# spec file for package yast2-online-update (Version 2.16.7)
#
-# 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.
#
@@ -10,13 +10,14 @@
# norootforbuild
+
Name: yast2-online-update
-Version: 2.16.6
+Version: 2.16.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.16.6.tar.bz2
+Source0: yast2-online-update-2.16.7.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager
PreReq: grep sed
@@ -48,7 +49,7 @@
gs@suse.de
%prep
-%setup -n yast2-online-update-2.16.6
+%setup -n yast2-online-update-2.16.7
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-online-update-2.16.6.tar.bz2 -> yast2-online-update-2.16.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.6/src/AutoOnlineUpdate.ycp new/yast2-online-update-2.16.7/src/AutoOnlineUpdate.ycp
--- old/yast2-online-update-2.16.6/src/AutoOnlineUpdate.ycp 2007-12-17 13:02:05.000000000 +0100
+++ new/yast2-online-update-2.16.7/src/AutoOnlineUpdate.ycp 2007-12-17 13:09:42.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of AutoOnlineUpdate, input and output functions.
* Authors: Anas Nashif
*
- * $Id: AutoOnlineUpdate.ycp 41661 2007-10-31 10:23:17Z jsuchome $
+ * $Id: AutoOnlineUpdate.ycp 43124 2007-12-17 12:09:42Z jsuchome $
*
* Representation of the configuration of AutoOnlineUpdate.
* Input and output routines.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.6/src/online_update_select.ycp new/yast2-online-update-2.16.7/src/online_update_select.ycp
--- old/yast2-online-update-2.16.6/src/online_update_select.ycp 2007-11-08 11:19:15.000000000 +0100
+++ new/yast2-online-update-2.16.7/src/online_update_select.ycp 2008-02-21 12:40:40.000000000 +0100
@@ -25,7 +25,8 @@
{
string initMessage = _("Initializing for CD update...");
UI::OpenDialog(`opt(`decorated ),`Label( initMessage ));
- OnlineUpdate::cd_source = Pkg::SourceCreate ("cd:///", "patches");
+ OnlineUpdate::cd_source = Pkg::SourceCreate (
+ OnlineUpdate::cd_url, OnlineUpdate::cd_directory);
UI::CloseDialog();
if (OnlineUpdate::cd_source == -1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.6/src/online_update.ycp new/yast2-online-update-2.16.7/src/online_update.ycp
--- old/yast2-online-update-2.16.6/src/online_update.ycp 2007-12-03 15:10:58.000000000 +0100
+++ new/yast2-online-update-2.16.7/src/online_update.ycp 2008-02-21 12:40:40.000000000 +0100
@@ -159,8 +159,38 @@
if (OnlineUpdate::cd_update && OnlineUpdate::cd_source > -1)
{
- SourceManager::SyncYaSTInstSourceWithZMD ();
- Pkg::SourceFinishAll ();
+ // map of the new source added on start
+ map new_source = $[];
+ list<map> sources = [];
+ foreach (map one_source, Pkg::SourceEditGet (), {
+ integer srcid = one_source["SrcId"]:-1;
+ map source_data = union (Pkg::SourceGeneralData (srcid),
+ Pkg::SourceProductData (srcid));
+ if (srcid == OnlineUpdate::cd_source)
+ new_source = source_data;
+ else
+ sources = add (sources, source_data);
+ });
+ boolean add_new_source = true;
+ foreach (map source, sources, {
+ y2debug ("source to check %1", source);
+ // checking URL is not enough, typical url is cd:///
+ if (source["url"]:"" == new_source["url"]:"" &&
+ source["product_dir"]:"" == new_source["product_dir"]:"" &&
+ source["productname"]:"" == new_source["productname"]:"" &&
+ source["productversion"]:"" == new_source["productversion"]:"")
+ {
+ y2milestone ("Patch CD source already present, not adding again");
+ add_new_source = false;
+ break;
+ }
+ });
+
+ if (add_new_source)
+ {
+ SourceManager::SyncYaSTInstSourceWithZMD ();
+ Pkg::SourceFinishAll ();
+ }
}
retval = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.6/src/OnlineUpdate.ycp new/yast2-online-update-2.16.7/src/OnlineUpdate.ycp
--- old/yast2-online-update-2.16.6/src/OnlineUpdate.ycp 2007-05-11 13:34:01.000000000 +0200
+++ new/yast2-online-update-2.16.7/src/OnlineUpdate.ycp 2008-02-21 12:40:40.000000000 +0100
@@ -37,5 +37,15 @@
*/
global boolean simple_mode = false;
+/**
+ * Default URL for Patch CD source
+ */
+global string cd_url = "cd:///";
+
+/**
+ * Default Patch CD source directory
+ */
+global string cd_directory = "patches";
+
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.6/VERSION new/yast2-online-update-2.16.7/VERSION
--- old/yast2-online-update-2.16.6/VERSION 2007-12-17 13:02:57.000000000 +0100
+++ new/yast2-online-update-2.16.7/VERSION 2008-02-21 12:41:57.000000000 +0100
@@ -1 +1 @@
-2.16.6
+2.16.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org