Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-installation
  • From: root@xxxxxxx (h_root)
  • Date: Sat, 1 Apr 2006 00:10:28 +0200 (CEST)
  • Message-id: <20060331221028.34DCD8B79E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation
checked in at Sat Apr 1 00:10:28 CEST 2006.

--------
--- yast2-installation/yast2-installation.changes 2006-03-30 19:36:24.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-03-31 17:32:35.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Mar 31 17:32:03 CEST 2006 - mvidner@xxxxxxx
+
+- Tell ZMD to get the inst source (#156030)
+- No unlocking after all (#160319)
+ - Don't reset zypp
+ - Reenable Back
+ - Fetch update source from suse_resigster and add it
+- 2.13.55
+
+-------------------------------------------------------------------

Old:
----
yast2-installation-2.13.54.tar.bz2

New:
----
yast2-installation-2.13.55.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.C4ouqX/_old 2006-04-01 00:10:14.000000000 +0200
+++ /var/tmp/diff_new_pack.C4ouqX/_new 2006-04-01 00:10:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.54)
+# spec file for package yast2-installation (Version 2.13.55)
#
# Copyright (c) 2006 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.13.54
+Version: 2.13.55
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.54.tar.bz2
+Source0: yast2-installation-2.13.55.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-installation-2.13.54
+%setup -n yast2-installation-2.13.55

%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,13 @@
/usr/X11R6/share/fvwm/

%changelog -n yast2-installation
+* Fri Mar 31 2006 - mvidner@xxxxxxx
+- Tell ZMD to get the inst source (#156030)
+- No unlocking after all (#160319)
+- Don't reset zypp
+- Reenable Back
+- Fetch update source from suse_resigster and add it
+- 2.13.55
* Thu Mar 30 2006 - mvidner@xxxxxxx
- Reset zypp and release its lock before suse_register (#160319).
Therefore disabled the Back button.

++++++ yast2-installation-2.13.54.tar.bz2 -> yast2-installation-2.13.55.tar.bz2 ++++++
++++ 14436 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.13.54/VERSION new/yast2-installation-2.13.55/VERSION
--- old/yast2-installation-2.13.54/VERSION 2006-03-30 19:18:01.000000000 +0200
+++ new/yast2-installation-2.13.55/VERSION 2006-03-31 17:31:47.000000000 +0200
@@ -1 +1 @@
-2.13.54
+2.13.55
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.13.54/configure.in new/yast2-installation-2.13.55/configure.in
--- old/yast2-installation-2.13.54/configure.in 2006-03-30 19:33:05.000000000 +0200
+++ new/yast2-installation-2.13.55/configure.in 2006-03-31 18:00:28.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-installation, 2.13.54, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.55, http://www.suse.de/feedback, yast2-installation)
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.13.54"
+VERSION="2.13.55"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

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.13.54/control/docs/control-doc.xml new/yast2-installation-2.13.55/control/docs/control-doc.xml
--- old/yast2-installation-2.13.54/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100
+++ new/yast2-installation-2.13.55/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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.13.54/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.55/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.54/src/clients/inst_suse_register.ycp 2006-03-30 19:17:03.000000000 +0200
+++ new/yast2-installation-2.13.55/src/clients/inst_suse_register.ycp 2006-03-31 17:11:23.000000000 +0200
@@ -29,6 +29,7 @@
import "Label";
import "Internet";
import "Register";
+ import "SourceManager";

// no network - no suse_register
if (!Mode::normal())
@@ -452,8 +453,7 @@
// check if we are in installation workflow or running independently
if (Mode::normal()) Wizard::CreateDialog();

- // disable back once zypp forgets the caches and lock by Init
- boolean enable_back = false; // GetInstArgs::enable_back()
+ boolean enable_back = GetInstArgs::enable_back();
// we always need the next button
Wizard::SetContents (title, contents, help, enable_back, true);

@@ -472,10 +472,15 @@

/* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */

- // before calling suse_register, which calls zmd,
- // forget zypp caches and also release the zypp lock!
- // reinitalize ZYpp while rug is adding the source for us
- Pkg::Init ();
+ // no release needed, we add the source ourselves and ZMD can cope
+ if (false)
+ {
+ // before calling suse_register, which calls zmd,
+ // forget zypp caches and also release the zypp lock!
+ // reinitalize ZYpp while rug is adding the source for us
+ //Pkg::Init ();
+ }
+ SourceManager::SyncYaSTInstSourceWithZMD (); // #156030

repeat {
ret = Wizard::UserInput();
@@ -630,6 +635,7 @@

// we are done, end of loop
loopend = true;
+ Register::add_update_sources();
}

// handle any other error codes
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.13.54/src/modules/Register.ycp new/yast2-installation-2.13.55/src/modules/Register.ycp
--- old/yast2-installation-2.13.54/src/modules/Register.ycp 2006-03-29 16:33:09.000000000 +0200
+++ new/yast2-installation-2.13.55/src/modules/Register.ycp 2006-03-31 16:17:41.000000000 +0200
@@ -23,6 +23,16 @@


// --------------------------------------------------------------
+// START: Locally defined data
+// --------------------------------------------------------------
+
+string services_file = sformat ("%1/update_services", SCR::Read (.target.tmpdir));
+
+// ------------------------------------------------------------------
+// END: Locally defined data
+// ------------------------------------------------------------------
+
+// --------------------------------------------------------------
// START: Globally defined data, access via Register::<variable>
// --------------------------------------------------------------

@@ -194,6 +204,7 @@
// always log and beautify!
string params = " -y -L ~/.suse_register.log ";
if (parameter == `p) params = params + " -p ";
+ else params = params + sformat(" --dumpfile=%1 ", services_file);

if (parameter == `autoyast)
{
@@ -226,6 +237,32 @@



+
+global boolean add_update_sources ()
+{
+
+ // make it possible to be run as non-root (system will be inconsistent then)
+ // TODO: to be removed when rug lets authorized users add installation sources
+ if ( !iamroot ) return false;
+
+ if (!FileUtils::Exists (services_file))
+ return false;
+
+ foreach (string url,
+ splitstring ((string)SCR::Read(.target.string, services_file),"\n"), {
+
+ map parsed = URL::Parse (url);
+ if (parsed != $[])
+ {
+ Pkg::SourceCreate (parsed["scheme"]:"http" + "://" + parsed["host"]:"" + parsed["port"]:"", parsed["path"]:"");
+ }
+ });
+}
+
+
+
+
+
// ------------------------------------------------------------------
// END: Globally defined functions
// ------------------------------------------------------------------


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >