Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Apr 28 21:16:19 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-27 10:53:17.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-28 09:58:00.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Apr 28 09:51:08 CEST 2006 - jsuchome@suse.cz
+
+- show reasonable error message when rug fails
+- 2.13.104
+
+-------------------------------------------------------------------
+Thu Apr 27 16:49:42 CEST 2006 - mvidner@suse.cz
+
+- Tell libzypp-zmd-backend not to write sources to zypp db,
+ we are going to do it ourselves (#170113).
+- 2.13.103
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.102.tar.bz2
New:
----
yast2-packager-2.13.104.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.RKmTMn/_old 2006-04-28 21:16:10.000000000 +0200
+++ /var/tmp/diff_new_pack.RKmTMn/_new 2006-04-28 21:16:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.102)
+# spec file for package yast2-packager (Version 2.13.104)
#
# 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-packager
-Version: 2.13.102
+Version: 2.13.104
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.102.tar.bz2
+Source0: yast2-packager-2.13.104.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.102
+%setup -n yast2-packager-2.13.104
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Fri Apr 28 2006 - jsuchome@suse.cz
+- show reasonable error message when rug fails
+- 2.13.104
+* Thu Apr 27 2006 - mvidner@suse.cz
+- Tell libzypp-zmd-backend not to write sources to zypp db,
+ we are going to do it ourselves (#170113).
+- 2.13.103
* Thu Apr 27 2006 - locilka@suse.cz
- Do not create the /etc/mdadm.conf file when it is not needed
or when the file already exists (during inst-update) (#169710)
++++++ yast2-packager-2.13.102.tar.bz2 -> yast2-packager-2.13.104.tar.bz2 ++++++
++++ 2731 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-packager-2.13.102/Makefile.am new/yast2-packager-2.13.104/Makefile.am
--- old/yast2-packager-2.13.102/Makefile.am 2006-04-27 10:54:35.000000000 +0200
+++ new/yast2-packager-2.13.104/Makefile.am 2006-04-07 11:33:00.000000000 +0200
@@ -8,7 +8,6 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -96,7 +95,7 @@
done
pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -117,7 +116,7 @@
fi
spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -144,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
-TAGVERSION = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,13 +199,10 @@
false; \
fi
-check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable
# For po/ modules
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-packager-2.13.102/VERSION new/yast2-packager-2.13.104/VERSION
--- old/yast2-packager-2.13.102/VERSION 2006-04-27 10:51:09.000000000 +0200
+++ new/yast2-packager-2.13.104/VERSION 2006-04-28 09:51:28.000000000 +0200
@@ -1 +1 @@
-2.13.102
+2.13.104
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-packager-2.13.102/configure.in new/yast2-packager-2.13.104/configure.in
--- old/yast2-packager-2.13.102/configure.in 2006-04-27 10:54:35.000000000 +0200
+++ new/yast2-packager-2.13.104/configure.in 2006-04-07 11:33:00.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.102, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.70, http://www.suse.de/feedback, yast2-packager)
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.102"
+VERSION="2.13.70"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
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-packager-2.13.102/src/modules/SourceManager.ycp new/yast2-packager-2.13.104/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.102/src/modules/SourceManager.ycp 2006-04-26 08:29:00.000000000 +0200
+++ new/yast2-packager-2.13.104/src/modules/SourceManager.ycp 2006-04-28 09:50:35.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 30463 2006-04-25 15:20:43Z mvidner $
+ * $Id: SourceManager.ycp 30549 2006-04-27 14:49:55Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -758,6 +758,8 @@
"stdout" : script_out,
"stderr" : script_err,
];
+ if (timed_out)
+ command_ret["timed_out"] = time_spent;
return command_ret;
}
@@ -882,7 +884,15 @@
// rug is a command name
_("rug failed to add a ZYPP service"):
_("rug failed to delete a ZYPP service");
- Report::LongError (sformat ("%1: %2", message, ret));
+ message = message + ":";
+ if (ret["stdout"]:[] != [])
+ message = message + "\n" + mergestring (ret["stdout"]:[], "\n");
+ if (ret["stderr"]:[] != [])
+ message = message + "\n" + mergestring (ret["stderr"]:[], "\n");
+ else if (haskey (ret, "timed_out"))
+ // error message
+ message = message + "\n" + sformat (_("Command timed out after %1 msec."), ret["timed_out"]:1000);
+ Report::LongError (message);
return false;
}
}
@@ -944,6 +954,40 @@
y2milestone("ZMD stopped");
}
+ integer source_locked = 0;
+ const string source_lock_flag = "/var/lib/zypp/sources-being-processed-by-yast";
+ /**
+ * Start a section where other processes (such as ZMD helpers) should not
+ * access the source database. #170113
+ * The calls may be nested.
+ */
+ global void Lock () {
+ if (source_locked == 0)
+ {
+ SCR::Write (.target.string, source_lock_flag, "bug 170113");
+ }
+ source_locked = source_locked + 1;
+ y2milestone ("%1", source_locked);
+ }
+
+ /**
+ * Other processes may access the source database again
+ */
+ global void Unlock () {
+ source_locked = source_locked - 1;
+ if (source_locked < 0)
+ {
+ y2internal ("Too many unlocks!");
+ source_locked = 0;
+ }
+ if (source_locked == 0)
+ {
+ SCR::Execute (.target.remove, source_lock_flag);
+ }
+ y2milestone ("%1", source_locked);
+ }
+
+
/**
* Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
* in the ZMD services, adds one if it is missing.
@@ -967,6 +1011,8 @@
UI::OpenDialog (`Label(_("Initializing catalogs...")));
y2milestone("--- Syncing YaST inst source with ZMD ---");
+ Lock ();
+
boolean ret = false;
// Check the ZMD status and start if not running
// If the ZMD wasn't running, we will try to start it
@@ -1008,6 +1054,8 @@
}
ZMDRestore (zmd_handle);
+ Unlock ();
+
y2milestone("--- Syncing finished ---");
UI::CloseDialog();
return ret;
@@ -1016,6 +1064,7 @@
global boolean SyncAddedAndDeleted (list<integer> added_src_ids,
list<integer> deleted_src_ids) {
boolean ret = false;
+ Lock ();
map zmd_handle = ZMDStart ();
if (ZMDWorking (zmd_handle)) {
ret = true;
@@ -1028,6 +1077,7 @@
});
}
ZMDRestore (zmd_handle);
+ Unlock ();
return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...