Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri May 23 02:03:15 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-05-19 17:57:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-05-22 14:57:07.000000000 +0200
@@ -1,0 +2,15 @@
+Thu May 22 14:54:42 CEST 2008 - locilka@suse.cz
+
+- Creating backup of files in /etc/ owned by pam package
+ before installation-upgrade starts (bnc #393066).
+- 2.16.51
+
+-------------------------------------------------------------------
+Thu May 22 10:06:26 CEST 2008 - lslezak@suse.cz
+
+- do not load repositories from the target system in repair mode
+ (bnc#392508)
+- the locking code was skipped, moved to the initialization part
+ (bnc#336678)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.16.50.tar.bz2
New:
----
yast2-packager-2.16.51.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.eg6947/_old 2008-05-23 02:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.eg6947/_new 2008-05-23 02:03:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.50)
+# spec file for package yast2-packager (Version 2.16.51)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-packager
-Version: 2.16.50
+Version: 2.16.51
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.50.tar.bz2
+Source0: yast2-packager-2.16.51.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
# empty package callbacks
@@ -72,7 +72,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.16.50
+%setup -n yast2-packager-2.16.51
%build
%{prefix}/bin/y2tool y2autoconf
@@ -108,6 +108,15 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Thu May 22 2008 locilka@suse.cz
+- Creating backup of files in /etc/ owned by pam package
+ before installation-upgrade starts (bnc #393066).
+- 2.16.51
+* Thu May 22 2008 lslezak@suse.cz
+- do not load repositories from the target system in repair mode
+ (bnc#392508)
+- the locking code was skipped, moved to the initialization part
+ (bnc#336678)
* Mon May 19 2008 locilka@suse.cz
- Fixed Community Repositories module behavior when called from
Add-Ons in the initial installation (bnc #392111).
++++++ yast2-packager-2.16.50.tar.bz2 -> yast2-packager-2.16.51.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.50/src/clients/inst_kickoff.ycp new/yast2-packager-2.16.51/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.16.50/src/clients/inst_kickoff.ycp 2008-04-18 15:39:55.000000000 +0200
+++ new/yast2-packager-2.16.51/src/clients/inst_kickoff.ycp 2008-05-22 14:57:19.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Do various tasks before starting with installation of rpms.
*
- * $Id: inst_kickoff.ycp 46850 2008-04-18 13:37:46Z locilka $
+ * $Id: inst_kickoff.ycp 47794 2008-05-22 12:57:19Z locilka $
*
*/
@@ -99,7 +99,7 @@
/**
* Handle the backup.
*/
- define void backup_stuff () ``{
+ define void backup_stuff () {
if (Installation::update_backup_modified)
{
@@ -114,17 +114,20 @@
SCR::Execute (.target.remove, Installation::destdir + "/var/lib/YaST2/backup_path");
}
+ // Removing all old backups
if (Installation::update_remove_old_backups)
{
+ y2milestone ("Removing old backups *-*-*.tar.{gz,bz2} from %1", Installation::update_backup_path);
SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " +
"/bin/rm -f " + Installation::update_backup_path + "/*-*-*.tar.{gz,bz2}");
}
+ // timestamp
+ string date = timestring ("%Y%m%d", time(), false);
+
if (true)
{
- string date = timestring ("%Y%m%d", time(), false);
-
- y2milestone ("backup of " + Directory::logdir);
+ y2milestone ("Creating backup of %1", Directory::logdir);
string filename = "";
integer num = 0;
@@ -155,8 +158,7 @@
if (Installation::update_backup_sysconfig)
{
- string date = timestring ("%Y%m%d", time(), false);
-
+ // backup /etc/sysconfig
if (SCR::Read (.target.size, Installation::destdir + "/etc/sysconfig") > 0)
{
y2milestone ("backup of /etc/sysconfig");
@@ -182,6 +184,7 @@
"/etc/sysconfig", Directory::logdir + "/y2log"));
}
}
+ // backup of /etc/rc.config*
else if (SCR::Read (.target.size, Installation::destdir + "/etc/rc.config") > 0 &&
SCR::Read (.target.size, Installation::destdir + "/etc/rc.config.d") > 0)
{
@@ -210,6 +213,42 @@
}
}
}
+
+ // Backup /etc/pam.d/ unconditionally
+ // bnc #393066
+ if (Mode::update()) {
+ string filename = "";
+ integer num = 0;
+
+ while (num < 42) {
+ filename = Installation::update_backup_path + "/etc.pam.d-" + date + "-" + sformat ("%1", num) + ".tar.gz";
+
+ // avoid from filename conflicts
+ if (! FileUtils::Exists (Installation::destdir + filename))
+ break;
+ num = num + 1;
+ }
+
+ string what_to_backup = "etc/pam.d etc/security etc/securetty etc/environment";
+
+ // enters the Installation::destdir
+ // and creates backup of etc/pam.d directory in Installation::update_backup_path
+ string cmd = sformat (
+ "cd '%1'; /bin/tar --ignore-failed-read -czf '.%2' %3",
+ String::Quote (Installation::destdir),
+ String::Quote (filename),
+ what_to_backup
+ );
+
+ y2milestone ("Creating backup of %1 in %2", what_to_backup, Installation::destdir + filename);
+
+ if (SCR::Execute (.target.bash, cmd) != 0) {
+ y2error ("backup command failed: %1", cmd);
+ // an error popup
+ Popup::Error (sformat (_("Backup of %1 failed. See %2 for details."),
+ "/etc/pam.d", Directory::logdir + "/y2log"));
+ }
+ }
}
/**
@@ -354,7 +393,7 @@
} else {
// See bnc #381227
- // files might have been copied alredy from image
+ // files might have been copied already from image
foreach (string filename, ["/etc/passwd", "/etc/group"], {
string filename_copy_to = sformat ("%1/%2", Installation::destdir, filename);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.50/src/modules/Packages.ycp new/yast2-packager-2.16.51/src/modules/Packages.ycp
--- old/yast2-packager-2.16.50/src/modules/Packages.ycp 2008-05-19 15:28:02.000000000 +0200
+++ new/yast2-packager-2.16.51/src/modules/Packages.ycp 2008-05-22 11:10:43.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 47670 2008-05-19 13:18:00Z lslezak $
+ * $Id: Packages.ycp 47782 2008-05-22 08:26:40Z lslezak $
*/
{
@@ -1259,6 +1259,29 @@
}
}
+// lock packages if needed
+void LockPackages()
+{
+ // lock 64-bit packages on PPC32 (bnc#336678)
+ if (Arch::ppc32())
+ {
+ y2milestone("PPC32 detected, locking 64-bit packages...");
+
+ map lock =
+ $[
+ "solvable:name" : [ "64bit" ]
+ ];
+
+ y2milestone("added lock %1: %2", lock, Pkg::AddLock(lock));
+
+ lock =
+ $[
+ "solvable:name" : [ "ppc64" ]
+ ];
+ y2milestone("added lock %1: %2", lock, Pkg::AddLock(lock));
+ }
+}
+
/**
* Initialize the repositories
* @param show_popup boolean true to display information about initialization
@@ -1279,7 +1302,7 @@
Initialize_BaseInit (show_popup, base_url, log_url);
- theSources = Pkg::SourceStartCache (true); // dummy in 1st stage
+ theSources = Stage::initial() ? [] : Pkg::SourceStartCache (true); // dummy in 1st stage
boolean again = true;
@@ -1318,6 +1341,8 @@
// FATE #302123
AddOnProduct::SetBaseProductURL (base_url);
+ LockPackages();
+
init_in_progress = false;
}
@@ -1494,6 +1519,7 @@
Kernel::ProbeKernel();
Packages::Reset ([`product]);
reinit = true;
+ LockPackages();
}
boolean initial_run = reinit || ! init_called;
@@ -1513,25 +1539,6 @@
{
Pkg::SetAdditionalLocales ([Language::language]);
}
-
- // lock 64-bit packages on PPC32 (bnc#336678)
- if (Arch::ppc32())
- {
- y2milestone("PPC32 detected, locking 64-bit packages...");
-
- map lock =
- $[
- "solvable:name" : [ "64bit" ]
- ];
-
- y2milestone("added lock %1: %2", lock, Pkg::AddLock(lock));
-
- lock =
- $[
- "solvable:name" : [ "ppc64" ]
- ];
- y2milestone("added lock %1: %2", lock, Pkg::AddLock(lock));
- }
}
SelectProduct ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.50/VERSION new/yast2-packager-2.16.51/VERSION
--- old/yast2-packager-2.16.50/VERSION 2008-05-19 17:58:24.000000000 +0200
+++ new/yast2-packager-2.16.51/VERSION 2008-05-22 14:57:12.000000000 +0200
@@ -1 +1 @@
-2.16.50
+2.16.51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org