openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2006
- 2 participants
- 169 discussions
Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Thu Mar 30 14:01:08 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 10:14:11.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 13:40:24.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 30 13:24:01 CEST 2006 - kkaempf(a)suse.de
+
+- add resolvable kind to output of query-pool.
+- move the zsources table to separate database (#161318)
+- rev 2786
+…
[View More]
+-------------------------------------------------------------------
@@ -5 +12 @@
-- treat "@system" catalog as subscribed.
+- treat "@system" catalog as subscribed (#161699)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.zSBThe/_old 2006-03-30 14:00:11.000000000 +0200
+++ /var/tmp/diff_new_pack.zSBThe/_new 2006-03-30 14:00:11.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1
-Release: 23
+Release: 24
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -69,8 +69,12 @@
%changelog -n libzypp-zmd-backend
* Thu Mar 30 2006 - kkaempf(a)suse.de
+- add resolvable kind to output of query-pool.
+- move the zsources table to separate database (#161318)
+- rev 2786
+* Thu Mar 30 2006 - kkaempf(a)suse.de
- prepare for "query-pool" helper.
-- treat "@system" catalog as subscribed.
+- treat "@system" catalog as subscribed (#161699)
- rev 2779
* Wed Mar 29 2006 - kkaempf(a)suse.de
- always treat zmd sources as 'remote' (#160402)
++++++ zmd-backend-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc
--- old/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 10:11:59.000000000 +0200
+++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 12:01:57.000000000 +0200
@@ -9,109 +9,119 @@
#include <zypp/SourceManager.h>
#include <zypp/base/Logger.h>
#include <zypp/base/Exception.h>
+#include <zypp/base/Algorithm.h>
using namespace std;
using namespace zypp;
-#include <sqlite3.h>
-#include "dbsource/DbAccess.h"
-
#undef ZYPP_BASE_LOGGER_LOGGROUP
#define ZYPP_BASE_LOGGER_LOGGROUP "query-pool"
//-----------------------------------------------------------------------------
+class PrintItem : public resfilter::PoolItemFilterFunctor
+{
+ public:
+ const string & _catalog;
+
+ PrintItem( const string & catalog )
+ : _catalog( catalog )
+ { }
+
+ bool operator()( PoolItem_Ref item )
+ {
+ if (_catalog.empty()
+ || _catalog == item->source().alias())
+ {
+ cout << (item.status().isInstalled() ? "i" : " ") << "|";
+ cout << item->kind() << "|";
+ cout << item->name() << "|";
+ cout << item->edition().version();
+ if (!item->edition().release().empty())
+ cout << "-" << item->edition().release();
+ cout << "|";
+ cout << item->arch() << endl;
+ }
+ return true;
+ }
+};
+
+
+
+
static void
-sync_sources( sqlite3 *db )
+query_pool( ZYpp::Ptr Z, const string & filter, const string & catalog)
{
- const char *query =
- "CREATE TABLE zsources ("
- "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "
- "zmd_id INTEGER DEFAULT 0, " // reference to catalogs table for zmd, 0 for zypp
- "alias VARCHAR, "
- "type VARCHAR, "
- "url VARCHAR, "
- "path VARCHAR "
- ")";
-
- int rc = sqlite3_exec( db, query, NULL, NULL, NULL );
- if (rc != SQLITE_OK) {
- ERR << "Can not create 'zsources'[" << rc << "]: " << sqlite3_errmsg( db ) << endl;
- ERR << query << endl;
-// ignore error, possibly already exists return;
- }
-
- // 1
- query = "SELECT id FROM zsources WHERE zmd_id = 0 AND alias = ?";
-
- sqlite3_stmt *select_h = NULL;
- rc = sqlite3_prepare( db, query, -1, &select_h, NULL );
- if (rc != SQLITE_OK) {
- ERR << "Can not create select query: " << sqlite3_errmsg( db ) << endl;
- return;
- }
-
- // 1 2 3 4
- query = "INSERT INTO zsources (alias, type, url, path) VALUES (?, ?, ?, ?)";
-
- sqlite3_stmt *insert_h = NULL;
- rc = sqlite3_prepare( db, query, -1, &insert_h, NULL );
- if (rc != SQLITE_OK) {
- ERR << "Can not create insert query: " << sqlite3_errmsg( db ) << endl;
- return;
+ Resolvable::Kind kind;
+
+#define FILTER_ALL "all"
+
+ if (filter == "packages") kind = ResTraits<zypp::Package>::kind;
+ else if (filter == "patches") kind = ResTraits<zypp::Patch>::kind;
+ else if (filter == "patterns") kind = ResTraits<zypp::Pattern>::kind;
+ else if (filter == "products") kind = ResTraits<zypp::Product>::kind;
+ else if (!filter.empty() && filter != FILTER_ALL) {
+ std::cerr << "usage: query-pool [packages|patches|patterns|products] [<alias>]" << endl;
+ exit( 1 );
}
+ bool system = (catalog == "@system");
+
+ MIL << "query_pool kind '" << kind << "', catalog '" << catalog << "'" << endl;
+
SourceManager_Ptr manager = SourceManager::sourceManager();
- try {
- manager->restore( "/" );
- }
- catch (Exception & excpt_r) {
- ZYPP_CAUGHT( excpt_r );
- ERR << "Couldn't restore sources" << endl;
- return;
- }
-
- std::list<SourceManager::SourceId> sources = manager->allSources();
- MIL << "Found " << sources.size() << " sources" << endl;
-
- for (std::list<SourceManager::SourceId>::const_iterator it = sources.begin(); it != sources.end(); ++it) {
- Source_Ref source = manager->findSource( *it );
-
- if (!source) {
- ERR << "SourceManager can't find source " << *it << endl;
- continue;
+ if (!system) {
+ try {
+ manager->restore( "/" );
}
+ catch (Exception & excpt_r) {
+ ZYPP_CAUGHT( excpt_r );
+ ERR << "Couldn't restore sources" << endl;
+ exit( 1 );
+ }
+ }
-
- sqlite3_bind_text( select_h, 1, source.alias().c_str(), -1, SQLITE_STATIC );
- rc = sqlite3_step( select_h );
-
- bool found = false;
- if (rc == SQLITE_ROW) {
- found = true;
- DBG << "Source '" << source.alias() << "' already synched" << endl;
- }
- else if (rc != SQLITE_DONE) {
- ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl;
- break;
- }
- sqlite3_reset( select_h );
-
- if (!found) {
- DBG << "Syncing source '" << source.alias() << "'" << endl;
- sqlite3_bind_text( insert_h, 1, source.alias().c_str(), -1, SQLITE_STATIC );
- std::string type = source.type();
- if (type.empty()) type = "YaST";
- sqlite3_bind_text( insert_h, 2, type.c_str(), -1, SQLITE_STATIC );
- sqlite3_bind_text( insert_h, 3, source.url().asString().c_str(), -1, SQLITE_STATIC );
- sqlite3_bind_text( insert_h, 4, source.path().asString().c_str(), -1, SQLITE_STATIC );
- rc = sqlite3_step( insert_h );
- if (rc != SQLITE_DONE) {
- ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl;
- break;
- }
- sqlite3_reset( insert_h );
+ if (system
+ || catalog.empty())
+ {
+ zypp::ResStore store = Z->target()->resolvables();
+ MIL << "System contributing " << store.size() << " resolvables" << endl;
+ Z->addResolvables( store, true );
+ }
+
+ for (SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); ++it) {
+ zypp::ResStore store = it->resolvables();
+ MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl;
+ Z->addResolvables( store, (it->id() == "@system") );
+ }
+
+ if (filter.empty()
+ || filter == FILTER_ALL)
+ {
+ if (system) {
+ PrintItem printitem( "" );
+ zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(),
+ zypp::resfilter::ByInstalled (),
+ zypp::functor::functorRef<bool,PoolItem> (printitem) );
+ }
+ else {
+ PrintItem printitem( catalog );
+ zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(),
+ zypp::functor::functorRef<bool,PoolItem> (printitem) );
+ }
+ }
+ else {
+ if (system) {
+ PrintItem printitem( "" );
+ zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ),
+ zypp::resfilter::ByInstalled (),
+ zypp::functor::functorRef<bool,PoolItem> (printitem) );
+ }
+ else {
+ PrintItem printitem( catalog );
+ zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ),
+ zypp::functor::functorRef<bool,PoolItem> (printitem) );
}
}
return;
@@ -122,11 +132,6 @@
int
main (int argc, char **argv)
{
- if (argc != 2) {
- std::cerr << "usage: " << argv[0] << " <database>" << endl;
- return 1;
- }
-
const char *logfile = getenv("ZYPP_LOGFILE");
if (logfile != NULL)
zypp::base::LogControl::instance().logfile( logfile );
@@ -134,21 +139,19 @@
zypp::base::LogControl::instance().logfile( ZMD_BACKEND_LOG );
MIL << "-------------------------------------" << endl;
- MIL << "START query-pool " << argv[1] << endl;
-
- ZYpp::Ptr God = backend::getZYpp();
- Target_Ptr target = backend::initTarget( God );
-
- DbAccess db( argv[1] );
- if (!db.openDb( true ))
- return 1;
+ string filter;
+ if (argc > 1)
+ filter = argv[1];
+ string catalog;
+ if (argc > 2)
+ catalog = argv[2];
- db.writeStore( God->target()->resolvables(), ResStatus::installed, "@system" );
+ MIL << "START query-pool " << filter << " " << catalog << endl;
- // sync SourceManager with sources table
- sync_sources( db.db() );
+ ZYpp::Ptr Z = backend::getZYpp();
+ Target_Ptr target = backend::initTarget( Z );
- db.closeDb();
+ query_pool( Z, filter, catalog );
MIL << "END query-pool" << endl;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-system.cc new/zmd-backend-7.1.1/src/query-system.cc
--- old/zmd-backend-7.1.1/src/query-system.cc 2006-03-28 22:25:22.000000000 +0200
+++ new/zmd-backend-7.1.1/src/query-system.cc 2006-03-30 13:19:23.000000000 +0200
@@ -22,8 +22,22 @@
//-----------------------------------------------------------------------------
static void
-sync_sources( sqlite3 *db )
+sync_sources( )
{
+
+ MIL << "sync_sources" << endl;
+
+ sqlite3 *db;
+ int rc = sqlite3_open( "/var/lib/zypp/backend.db", &db );
+
+ if (rc != SQLITE_OK) {
+ ERR << "Can not open SQL database zsources.db: " << sqlite3_errmsg( db ) << endl;
+ return;
+ }
+
+ sqlite3_exec (db, "PRAGMA synchronous = 0", NULL, NULL, NULL);
+ sqlite3_exec (db, "BEGIN", NULL, NULL, NULL);
+
const char *query =
"CREATE TABLE zsources ("
"id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "
@@ -34,7 +48,7 @@
"path VARCHAR "
")";
- int rc = sqlite3_exec( db, query, NULL, NULL, NULL );
+ rc = sqlite3_exec( db, query, NULL, NULL, NULL );
if (rc != SQLITE_OK) {
ERR << "Can not create 'zsources'[" << rc << "]: " << sqlite3_errmsg( db ) << endl;
ERR << query << endl;
@@ -114,6 +128,11 @@
sqlite3_reset( insert_h );
}
}
+
+ sqlite3_finalize( select_h );
+ sqlite3_finalize( insert_h );
+ sqlite3_close( db );
+
return;
}
@@ -146,7 +165,7 @@
db.writeStore( God->target()->resolvables(), ResStatus::installed, "@system" );
// sync SourceManager with sources table
- sync_sources( db.db() );
+ sync_sources( );
db.closeDb();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package suseRegister
checked in at Thu Mar 30 11:54:56 CEST 2006.
--------
--- suseRegister/suseRegister.changes 2006-03-29 17:34:09.000000000 +0200
+++ suseRegister/suseRegister.changes 2006-03-30 11:53:27.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 30 11:52:42 CEST 2006 - mc(a)suse.de
+
+- remove hack
+- use query-pool to get the products
+- remove rugProductArch
+
+-------------------------------------------------------------------
+++++++++…
[View More]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suseRegister.spec ++++++
--- /var/tmp/diff_new_pack.26C65g/_old 2006-03-30 11:54:28.000000000 +0200
+++ /var/tmp/diff_new_pack.26C65g/_new 2006-03-30 11:54:28.000000000 +0200
@@ -12,7 +12,7 @@
Name: suseRegister
Version: 1.0
-Release: 35
+Release: 36
Summary: Registration tool
Group: Productivity/Other
License: GPL
@@ -56,6 +56,10 @@
%{_bindir}/*
%changelog -n suseRegister
+* Thu Mar 30 2006 - mc(a)suse.de
+- remove hack
+- use query-pool to get the products
+- remove rugProductArch
* Wed Mar 29 2006 - mc(a)suse.de
- add hack to make rug products work
* Wed Mar 29 2006 - mc(a)suse.de
++++++ suseRegister-1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register
--- old/suseRegister-1.0/suse_register 2006-03-29 17:03:03.000000000 +0200
+++ new/suseRegister-1.0/suse_register 2006-03-30 11:52:25.000000000 +0200
@@ -83,6 +83,7 @@
my @registerReadableText = ();
my $registerPrivPol = "";
+my $querypool = "/usr/lib/zmd/query-pool";
my $rug = "/usr/bin/rug";
my $lsb_release = "/usr/bin/lsb_release";
my $uname = "/bin/uname";
@@ -97,6 +98,7 @@
my $lastResponse = "";
my $initialDomain = "";
+
push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_ca_path', $CA_PATH);
push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_ca_file', undef);
push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_verify_mode', 0x01 | 0x02 | 0x04);
@@ -1234,116 +1236,47 @@
return 1;
}
-sub rugProductArch
+sub rugProducts
{
- my $product = shift || undef;
- my $ret = "noarch";
- my $err = "";
-
- if(!defined $product || $product eq "")
- {
- return "noarch";
- }
-
- my @rugArgs = ("--terse", "product-info", "$product");
-
- print STDERR "rug product-info command: $rug ".join(" ",@rugArgs)."\n" if($debug >= 1);
-
- my $pid = open3(\*INA, \*OUTA, \*ERRA, $rug, @rugArgs) or do {
- logPrintExit("Cannot execute $rug ".join(" ", @rugArgs).": $!\n",13);
- };
-
- while (<OUTA>)
- {
- if($_ =~ /^Arch:\s*(.+)\s*$/ && defined $1 && $1 ne "")
- {
- $ret = $1;
- last;
- }
- }
- #chomp($msg) if(defined $msg && $msg ne "");
- while (<ERRA>)
- {
- $err .= "$_";
- }
- close OUTA;
- close ERRA;
- close INA;
- waitpid $pid, 0;
+ print STDERR "query pool command: $querypool products \@system \n" if($debug >= 1);
+ my $result = `$querypool products \@system`;
my $code = ($?>>8);
- if($code != 0)
- {
- $code += 20;
- }
- print STDERR "Get product-info failed($code): $err\n" if($debug && $code != 0);
- if(!defined $ret || $ret eq "" || $ret eq "noarch")
+ if($code != 0)
{
- $ret = `$uname -i`;
- chomp($ret);
+ $code += 30;
+ syslog("err", "Query products failed($code): $result");
}
-
- return $ret;
-}
-
-
-sub rugProducts
-{
- my $msg = "";
- my $err = "";
-
- my @rugArgs = ("--terse", "--no-abbrev", "products", "-i");
-
- print STDERR "rug products command: $rug ".join(" ",@rugArgs)."\n" if($debug >= 1);
-
- my $pid = open3(\*IN, \*OUT, \*ERR, $rug, @rugArgs) or do {
- logPrintExit("Cannot execute $rug ".join(" ", @rugArgs).": $!\n",13);
- };
-
- while (<OUT>)
+ else
{
- next if($_ =~ /^\s*$/);
- $msg .= "$_";
-
- my @p = split('\|', $_);
- my $product = "";
- my $version = "";
- my $arch = "";
- if(defined $p[1] && $p[1] ne "")
- {
- $product = $p[1];
- $arch = rugProductArch($product);
- }
- if(defined $p[2] && $p[2] ne "")
+ foreach my $line (split("\n", $result))
{
- $version = $p[2];
- $version =~ s/-\s*$//;
- }
+ next if($line =~ /^\s*$/);
+
+ my @p = split('\|', $line);
+ my $installed = $p[0];
+ my $product = $p[1];
+ my $version = $p[2];
+ my $arch = $p[3];
- push @installedProducts, [$product, $version, $arch];
- }
- #chomp($msg) if(defined $msg && $msg ne "");
- while (<ERR>)
- {
- $err .= "$_";
+ if(!defined $arch || $arch eq "" || $arch eq "noarch")
+ {
+ $arch = `$uname -i`;
+ chomp($arch);
+ }
+
+ if($installed eq "i")
+ {
+ push @installedProducts, [$product, $version, $arch];
+ }
+ }
}
- close OUT;
- close ERR;
- close IN;
- waitpid $pid, 0;
- my $code = ($?>>8);
- if($code != 0)
- {
- $code += 20;
- }
-
- print STDERR "Get products failed($code): $msg $err\n" if($debug && $code != 0);
-
+ print STDERR "Query products failed($code): $result\n" if($debug && $code != 0);
+
print STDERR "installed products: ".Data::Dumper->Dump([\@installedProducts])."\n" if($debug);
-
}
@@ -2067,20 +2000,10 @@
# call this as soon as possible.
rugStart();
-
-############################################
-### BEGIN ugly hack
-############################################
-
-my $msg = `$zmdInit restart 2>&1`;
-
-sleep 6;
-
-### END ugly hack
-
if (defined $logfile && $logfile ne "")
{
- open($LOGDESCR, ">> $logfile") or do {
+ open($LOGDESCR, ">> $logfile") or do
+ {
if(!$yastcall)
{
logPrintExit("Cannot open logfile <$logfile>: $!\n", 12);
@@ -2150,7 +2073,6 @@
}
}
-
if (defined $locale)
{
my ($l, $e) = split(/\.|@/, $locale, 2);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package zmd
checked in at Thu Mar 30 11:53:29 CEST 2006.
--------
--- zmd/zmd.changes 2006-03-30 10:46:04.000000000 +0200
+++ zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200
@@ -2 +2 @@
-Thu Mar 30 10:45:52 CEST 2006 - aj(a)suse.de
+Thu Mar 30 10:10:52 CEST 2006 - aj(a)suse.de
@@ -6,0 +7,12 @@
+Thu Mar 30 04:03:14 CEST 2006 - maw(a)suse.de
+
+- Teach zmd to restart when it's updated (#162043).
+
+------------------------------------------…
[View More]-------------------------
+Thu Mar 30 02:42:17 CEST 2006 - thunder(a)suse.de
+
+- New source drop (r26462) which:
+- Adds arch filtering (#158187).
+- Expires the web cache after refresh.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.1A10fD/_old 2006-03-30 11:51:47.000000000 +0200
+++ /var/tmp/diff_new_pack.1A10fD/_new 2006-03-30 11:51:47.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel
URL: http://www.novell.com
Version: 7.1.1
-Release: 34
+Release: 35
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-7.1.1.tar.bz2
@@ -106,6 +106,7 @@
%{insserv_force_if_yast novell-zmd}
%postun
+%{restart_on_update zmd}
%{insserv_cleanup}
%files -f %{name}.lang
@@ -157,6 +158,12 @@
%changelog -n zmd
* Thu Mar 30 2006 - aj(a)suse.de
- Package /var/run/zmd [#162079].
+* Thu Mar 30 2006 - maw(a)suse.de
+- Teach zmd to restart when it's updated (#162043).
+* Thu Mar 30 2006 - thunder(a)suse.de
+- New source drop (r26462) which:
+- Adds arch filtering (#158187).
+- Expires the web cache after refresh.
* Wed Mar 29 2006 - maw(a)suse.de
- New source drop (r26368) which:
- Makes sure there is sufficient disk space before downloading
++++++ zmd-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog
--- old/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200
+++ new/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200
@@ -1,3 +1,14 @@
+2006-03-29 Chris Rivera <cmr(a)ximian.com>
+
+ * linux/PackageManager.cs: Add arch filtering for QueryLatest and
+ GetLatestVersion.
+
+2006-03-28 James Willcox <james(a)ximian.com>
+
+ * linux/RPMBackend.cs: only delay loading the installed packages
+ when the db changes outsize of zmd. After transactions, do it
+ immediately.
+
2006-03-28 James Willcox <james(a)ximian.com>
* linux/Transaction.cs: check to make sure we have enough disk
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs
--- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-25 01:29:42.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-03-29 17:32:10.000000000 +0200
@@ -49,19 +49,6 @@
public event EventHandler InstalledPackagesChanged;
public void OnInstalledPackagesChanged () {
- lock (this) {
- if (delayedSchedule != null) {
- ScheduleManager.Instance.RemoveSchedule (delayedSchedule);
- delayedSchedule = null;
- }
- delayedSchedule = new SimpleSchedule ("Package DB changed delay");
- delayedSchedule.Triggered += DelayedInstalledPackagesChanged;
- delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30);
- ScheduleManager.Instance.AddSchedule (delayedSchedule);
- }
- }
-
- private void DelayedInstalledPackagesChanged (object o, EventArgs args) {
if (InstalledPackagesChanged != null)
InstalledPackagesChanged (this, null);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs
--- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-29 02:07:30.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200
@@ -141,27 +141,12 @@
}
public static Package GetLatestVersion (string name, bool subscribedOnly) {
- // Find latest installed version
- Package latestInstalled = null;
- foreach (Package pkg in Query ("Name", QueryType.Equal, name, QueryType.And,
- "IsInstalled", QueryType.Equal, true)) {
- if (latestInstalled == null || pkg.CompareTo (latestInstalled) > 0)
- latestInstalled = pkg;
+ IEnumerable pkgs = Query ("Name", "is", name, "and", "IsSubscribed", "is", subscribedOnly);
+ foreach (Package pkg in FilterPackagesForArch (pkgs)) {
+ return pkg;
}
- // Find latest version
- Package latest = null;
- foreach (Package pkg in Query ("Name", QueryType.Equal, name,
- QueryType.And,
- "IsSubscribed", QueryType.Equal, subscribedOnly)) {
- if (latestInstalled != null && latestInstalled.CompareTo (pkg) >= 0)
- continue;
-
- if (latest == null || pkg.CompareTo (latest) > 0)
- latest = pkg;
- }
-
- return latest;
+ return null;
}
public static ResolverResult Verify () {
@@ -319,6 +304,72 @@
return packages.Query (query);
}
+ // -1: old package 0: update 1: new install
+ private static int GetPackageStatus (Package pkg) {
+ foreach (Package p in installed.Query ("Name", "is", pkg.Name, "and", "IsInstalled", "is", true, "and",
+ "Arch", "is", pkg.Arch)) {
+ return pkg.CompareTo (p) > 0 ? 0 : -1;
+ }
+
+ return 1;
+ }
+
+ /*
+ * This function returns all updates for all arches and at most one "best"
+ * installation per package name.
+ */
+ private static IEnumerable FilterPackagesForArch (IEnumerable list) {
+ Hashtable installs = new Hashtable ();
+ Hashtable updates = new Hashtable ();
+
+ foreach (IResolvable res in list) {
+ Package pkg = res as Package;
+ if (pkg == null)
+ continue;
+
+ int pkgScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, pkg.Arch);
+ if (pkgScore < 0)
+ continue;
+
+ int packageStatus = GetPackageStatus (pkg);
+ if (packageStatus == 0) {
+ string key = String.Format ("{0}.{1}", pkg.Name, pkg.Arch);
+ Package existing = updates[key] as Package;
+ if (existing == null || pkg.CompareTo (existing) > 0) {
+ updates[key] = pkg;
+ }
+ } else if (packageStatus == 1) {
+ Package existing = installs[pkg.Name] as Package;
+ if (existing == null) {
+ installs[pkg.Name] = pkg;
+ } else {
+ int exScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, existing.Arch);
+ if (pkgScore == 0 && exScore == 0) {
+ if (pkg.CompareTo (existing) > 0) {
+ installs[pkg.Name] = pkg;
+ }
+ } else if (pkgScore == 0) {
+ installs[pkg.Name] = pkg;
+ } else if (exScore != 0) {
+ installs[pkg.Name] = pkgScore > exScore ? pkg : existing;
+ }
+ }
+ }
+ }
+
+ // We want to remove installs for packages we are going to upgrade
+ ArrayList ret = new ArrayList ();
+ foreach (Package up in updates.Values) {
+ if (installs[up.Name] != null) {
+ installs.Remove (up.Name);
+ }
+ }
+
+ ret.AddRange (updates.Values);
+ ret.AddRange (installs.Values);
+ return ret;
+ }
+
public static ICollection FilterResolvables (IEnumerable list) {
Hashtable hash = new Hashtable ();
Backend be = Backend.Current;
@@ -334,7 +385,7 @@
}
public static IEnumerable QueryLatest (IList query) {
- return FilterResolvables (packages.Query (query));
+ return FilterPackagesForArch (packages.Query (query));
}
public static Package QueryFile (string path) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/RPMBackend.cs new/zmd-7.1.1/modules/linux/RPMBackend.cs
--- old/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-16 16:53:22.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-29 17:32:10.000000000 +0200
@@ -2,6 +2,7 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
+using Novell.Zenworks.Zmd.Scheduling;
using log4net;
@@ -9,6 +10,7 @@
public abstract class RPMBackend : Backend {
private FileSystemWatcher watcher;
private bool ignoring;
+ private SimpleSchedule delayedSchedule;
private static bool useLibrpm = true;
private static readonly ILog log = LogManager.GetLogger (typeof (RPMBackend));
@@ -179,8 +181,21 @@
}
private void Changed (object sender, FileSystemEventArgs e) {
- if (!ignoring) {
- OnInstalledPackagesChanged ();
+ if (ignoring)
+ return;
+
+ lock (this) {
+ if (delayedSchedule != null) {
+ ScheduleManager.Instance.RemoveSchedule (delayedSchedule);
+ delayedSchedule = null;
+ }
+ delayedSchedule = new SimpleSchedule ("Package DB changed delay");
+ delayedSchedule.Triggered += delegate {
+ OnInstalledPackagesChanged ();
+ };
+
+ delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30);
+ ScheduleManager.Instance.AddSchedule (delayedSchedule);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/po/zmd.pot new/zmd-7.1.1/po/zmd.pot
--- old/zmd-7.1.1/po/zmd.pot 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/zmd.pot 2006-03-30 02:30:58.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-29 19:30-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -102,16 +102,16 @@
msgid "Save transaction history and changed files, allowing rollback"
msgstr ""
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
+#: modules/linux/PackageManager.cs:155 modules/linux/PackageManager.cs:163
+#: modules/linux/PackageManager.cs:246 modules/linux/PackageManager.cs:273
msgid "Another transaction is already running."
msgstr ""
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:243 modules/linux/PackageManager.cs:268
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:408
msgid "File list not available."
msgstr ""
@@ -696,12 +696,12 @@
msgid "Refreshing Services"
msgstr ""
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr ""
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs
--- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-27 00:42:20.000000000 +0200
+++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/opt/zypp";
- public const string SYSCONFDIR = "/opt/zypp/etc";
- public const string DATADIR = "/opt/zypp/share";
- public const string LIBDIR = "/opt/zypp/lib";
- public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib";
- public const string LOCALSTATEDIR = "/opt/zypp/var";
+ public const string PREFIX = "/usr";
+ public const string SYSCONFDIR = "/etc";
+ public const string DATADIR = "/usr/share";
+ public const string LIBDIR = "/usr/lib64";
+ public const string LIBDIR_MANAGED = "/usr" + "/lib";
+ public const string LOCALSTATEDIR = "/var";
- public const string LOGDIR = "/opt/zypp/var/log";
+ public const string LOGDIR = "/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog
--- old/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200
+++ new/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200
@@ -1,3 +1,7 @@
+2006-03-29 James Willcox <james(a)ximian.com>
+
+ * ServiceManager.cs: expire the cache after refresh
+
2006-03-28 James Willcox <james(a)ximian.com>
* DaemonProperties.cs: add MonoVersion property, which uses evil
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ServiceManager.cs new/zmd-7.1.1/src/ServiceManager.cs
--- old/zmd-7.1.1/src/ServiceManager.cs 2006-03-27 02:51:26.000000000 +0200
+++ new/zmd-7.1.1/src/ServiceManager.cs 2006-03-30 02:26:02.000000000 +0200
@@ -559,6 +559,7 @@
public static void OnRefreshFinished (Progress progress) {
WebCache.ForceCache = false;
+ WebCache.Expire ();
if (progress.Status == ProgressStatus.Finished) {
log.Info ("Finished Service Refresh");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package zmd
checked in at Thu Mar 30 10:47:19 CEST 2006.
--------
--- zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200
+++ zmd/zmd.changes 2006-03-30 10:46:04.000000000 +0200
@@ -2 +2 @@
-Thu Mar 30 10:10:52 CEST 2006 - aj(a)suse.de
+Thu Mar 30 10:45:52 CEST 2006 - aj(a)suse.de
@@ -7,12 +6,0 @@
-Thu Mar 30 04:03:14 CEST 2006 - maw(a)suse.de
-
-- Teach zmd to restart when it's updated (#162043).
-
-------------------------------------------…
[View More]-------------------------
-Thu Mar 30 02:42:17 CEST 2006 - thunder(a)suse.de
-
-- New source drop (r26462) which:
-- Adds arch filtering (#158187).
-- Expires the web cache after refresh.
-
--------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.UqeNsd/_old 2006-03-30 10:46:58.000000000 +0200
+++ /var/tmp/diff_new_pack.UqeNsd/_new 2006-03-30 10:46:58.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel
URL: http://www.novell.com
Version: 7.1.1
-Release: 33
+Release: 34
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-7.1.1.tar.bz2
@@ -106,7 +106,6 @@
%{insserv_force_if_yast novell-zmd}
%postun
-%{restart_on_update zmd}
%{insserv_cleanup}
%files -f %{name}.lang
@@ -158,12 +157,6 @@
%changelog -n zmd
* Thu Mar 30 2006 - aj(a)suse.de
- Package /var/run/zmd [#162079].
-* Thu Mar 30 2006 - maw(a)suse.de
-- Teach zmd to restart when it's updated (#162043).
-* Thu Mar 30 2006 - thunder(a)suse.de
-- New source drop (r26462) which:
-- Adds arch filtering (#158187).
-- Expires the web cache after refresh.
* Wed Mar 29 2006 - maw(a)suse.de
- New source drop (r26368) which:
- Makes sure there is sufficient disk space before downloading
++++++ zmd-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog
--- old/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200
+++ new/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200
@@ -1,14 +1,3 @@
-2006-03-29 Chris Rivera <cmr(a)ximian.com>
-
- * linux/PackageManager.cs: Add arch filtering for QueryLatest and
- GetLatestVersion.
-
-2006-03-28 James Willcox <james(a)ximian.com>
-
- * linux/RPMBackend.cs: only delay loading the installed packages
- when the db changes outsize of zmd. After transactions, do it
- immediately.
-
2006-03-28 James Willcox <james(a)ximian.com>
* linux/Transaction.cs: check to make sure we have enough disk
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs
--- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-29 17:32:10.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-03-25 01:29:42.000000000 +0100
@@ -49,6 +49,19 @@
public event EventHandler InstalledPackagesChanged;
public void OnInstalledPackagesChanged () {
+ lock (this) {
+ if (delayedSchedule != null) {
+ ScheduleManager.Instance.RemoveSchedule (delayedSchedule);
+ delayedSchedule = null;
+ }
+ delayedSchedule = new SimpleSchedule ("Package DB changed delay");
+ delayedSchedule.Triggered += DelayedInstalledPackagesChanged;
+ delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30);
+ ScheduleManager.Instance.AddSchedule (delayedSchedule);
+ }
+ }
+
+ private void DelayedInstalledPackagesChanged (object o, EventArgs args) {
if (InstalledPackagesChanged != null)
InstalledPackagesChanged (this, null);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs
--- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-29 02:07:30.000000000 +0200
@@ -141,12 +141,27 @@
}
public static Package GetLatestVersion (string name, bool subscribedOnly) {
- IEnumerable pkgs = Query ("Name", "is", name, "and", "IsSubscribed", "is", subscribedOnly);
- foreach (Package pkg in FilterPackagesForArch (pkgs)) {
- return pkg;
+ // Find latest installed version
+ Package latestInstalled = null;
+ foreach (Package pkg in Query ("Name", QueryType.Equal, name, QueryType.And,
+ "IsInstalled", QueryType.Equal, true)) {
+ if (latestInstalled == null || pkg.CompareTo (latestInstalled) > 0)
+ latestInstalled = pkg;
}
- return null;
+ // Find latest version
+ Package latest = null;
+ foreach (Package pkg in Query ("Name", QueryType.Equal, name,
+ QueryType.And,
+ "IsSubscribed", QueryType.Equal, subscribedOnly)) {
+ if (latestInstalled != null && latestInstalled.CompareTo (pkg) >= 0)
+ continue;
+
+ if (latest == null || pkg.CompareTo (latest) > 0)
+ latest = pkg;
+ }
+
+ return latest;
}
public static ResolverResult Verify () {
@@ -304,72 +319,6 @@
return packages.Query (query);
}
- // -1: old package 0: update 1: new install
- private static int GetPackageStatus (Package pkg) {
- foreach (Package p in installed.Query ("Name", "is", pkg.Name, "and", "IsInstalled", "is", true, "and",
- "Arch", "is", pkg.Arch)) {
- return pkg.CompareTo (p) > 0 ? 0 : -1;
- }
-
- return 1;
- }
-
- /*
- * This function returns all updates for all arches and at most one "best"
- * installation per package name.
- */
- private static IEnumerable FilterPackagesForArch (IEnumerable list) {
- Hashtable installs = new Hashtable ();
- Hashtable updates = new Hashtable ();
-
- foreach (IResolvable res in list) {
- Package pkg = res as Package;
- if (pkg == null)
- continue;
-
- int pkgScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, pkg.Arch);
- if (pkgScore < 0)
- continue;
-
- int packageStatus = GetPackageStatus (pkg);
- if (packageStatus == 0) {
- string key = String.Format ("{0}.{1}", pkg.Name, pkg.Arch);
- Package existing = updates[key] as Package;
- if (existing == null || pkg.CompareTo (existing) > 0) {
- updates[key] = pkg;
- }
- } else if (packageStatus == 1) {
- Package existing = installs[pkg.Name] as Package;
- if (existing == null) {
- installs[pkg.Name] = pkg;
- } else {
- int exScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, existing.Arch);
- if (pkgScore == 0 && exScore == 0) {
- if (pkg.CompareTo (existing) > 0) {
- installs[pkg.Name] = pkg;
- }
- } else if (pkgScore == 0) {
- installs[pkg.Name] = pkg;
- } else if (exScore != 0) {
- installs[pkg.Name] = pkgScore > exScore ? pkg : existing;
- }
- }
- }
- }
-
- // We want to remove installs for packages we are going to upgrade
- ArrayList ret = new ArrayList ();
- foreach (Package up in updates.Values) {
- if (installs[up.Name] != null) {
- installs.Remove (up.Name);
- }
- }
-
- ret.AddRange (updates.Values);
- ret.AddRange (installs.Values);
- return ret;
- }
-
public static ICollection FilterResolvables (IEnumerable list) {
Hashtable hash = new Hashtable ();
Backend be = Backend.Current;
@@ -385,7 +334,7 @@
}
public static IEnumerable QueryLatest (IList query) {
- return FilterPackagesForArch (packages.Query (query));
+ return FilterResolvables (packages.Query (query));
}
public static Package QueryFile (string path) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/RPMBackend.cs new/zmd-7.1.1/modules/linux/RPMBackend.cs
--- old/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-29 17:32:10.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-16 16:53:22.000000000 +0100
@@ -2,7 +2,6 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
-using Novell.Zenworks.Zmd.Scheduling;
using log4net;
@@ -10,7 +9,6 @@
public abstract class RPMBackend : Backend {
private FileSystemWatcher watcher;
private bool ignoring;
- private SimpleSchedule delayedSchedule;
private static bool useLibrpm = true;
private static readonly ILog log = LogManager.GetLogger (typeof (RPMBackend));
@@ -181,21 +179,8 @@
}
private void Changed (object sender, FileSystemEventArgs e) {
- if (ignoring)
- return;
-
- lock (this) {
- if (delayedSchedule != null) {
- ScheduleManager.Instance.RemoveSchedule (delayedSchedule);
- delayedSchedule = null;
- }
- delayedSchedule = new SimpleSchedule ("Package DB changed delay");
- delayedSchedule.Triggered += delegate {
- OnInstalledPackagesChanged ();
- };
-
- delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30);
- ScheduleManager.Instance.AddSchedule (delayedSchedule);
+ if (!ignoring) {
+ OnInstalledPackagesChanged ();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/po/zmd.pot new/zmd-7.1.1/po/zmd.pot
--- old/zmd-7.1.1/po/zmd.pot 2006-03-30 02:30:58.000000000 +0200
+++ new/zmd-7.1.1/po/zmd.pot 2006-03-29 02:30:22.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-29 19:30-0500\n"
+"POT-Creation-Date: 2006-03-28 19:30-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -102,16 +102,16 @@
msgid "Save transaction history and changed files, allowing rollback"
msgstr ""
-#: modules/linux/PackageManager.cs:155 modules/linux/PackageManager.cs:163
-#: modules/linux/PackageManager.cs:246 modules/linux/PackageManager.cs:273
+#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
+#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
msgid "Another transaction is already running."
msgstr ""
-#: modules/linux/PackageManager.cs:243 modules/linux/PackageManager.cs:268
+#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:408
+#: modules/linux/PackageManager.cs:357
msgid "File list not available."
msgstr ""
@@ -696,12 +696,12 @@
msgid "Refreshing Services"
msgstr ""
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:621
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr ""
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:784
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs
--- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200
+++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-27 00:42:20.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/usr";
- public const string SYSCONFDIR = "/etc";
- public const string DATADIR = "/usr/share";
- public const string LIBDIR = "/usr/lib64";
- public const string LIBDIR_MANAGED = "/usr" + "/lib";
- public const string LOCALSTATEDIR = "/var";
+ public const string PREFIX = "/opt/zypp";
+ public const string SYSCONFDIR = "/opt/zypp/etc";
+ public const string DATADIR = "/opt/zypp/share";
+ public const string LIBDIR = "/opt/zypp/lib";
+ public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib";
+ public const string LOCALSTATEDIR = "/opt/zypp/var";
- public const string LOGDIR = "/var/log";
+ public const string LOGDIR = "/opt/zypp/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog
--- old/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200
+++ new/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200
@@ -1,7 +1,3 @@
-2006-03-29 James Willcox <james(a)ximian.com>
-
- * ServiceManager.cs: expire the cache after refresh
-
2006-03-28 James Willcox <james(a)ximian.com>
* DaemonProperties.cs: add MonoVersion property, which uses evil
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ServiceManager.cs new/zmd-7.1.1/src/ServiceManager.cs
--- old/zmd-7.1.1/src/ServiceManager.cs 2006-03-30 02:26:02.000000000 +0200
+++ new/zmd-7.1.1/src/ServiceManager.cs 2006-03-27 02:51:26.000000000 +0200
@@ -559,7 +559,6 @@
public static void OnRefreshFinished (Progress progress) {
WebCache.ForceCache = false;
- WebCache.Expire ();
if (progress.Status == ProgressStatus.Finished) {
log.Info ("Finished Service Refresh");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package release-notes
checked in at Thu Mar 30 10:29:45 CEST 2006.
--------
--- release-notes/release-notes.changes 2006-03-27 14:40:21.000000000 +0200
+++ release-notes/release-notes.changes 2006-03-30 09:32:38.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Mar 30 09:31:48 CEST 2006 - ke(a)suse.de
+
+- Update to version 10.1.12:
+ * Update: Updating Software Packages Using Catalogs [#153037], kernel
+ modules [# 157554].
+ * Update: cs, sk.
+
+
+--…
[View More]-----------------------------------------------------------------
Old:
----
release-notes-10.1.11.tar.bz2
New:
----
release-notes-10.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ release-notes.spec ++++++
--- /var/tmp/diff_new_pack.2gVcnS/_old 2006-03-30 10:29:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2gVcnS/_new 2006-03-30 10:29:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package release-notes (Version 10.1.11)
+# spec file for package release-notes (Version 10.1.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: kdebase-SuSE:/usr/share/doc/RELEASE_NOTES.en.html
-Version: 10.1.11
+Version: 10.1.12
Release: 1
Source0: %{name}-%{version}.tar.bz2
Source8: release-notes.desktop.in
@@ -81,6 +81,11 @@
%doc /usr/share/doc/release-notes
%changelog -n release-notes
+* Thu Mar 30 2006 - ke(a)suse.de
+- Update to version 10.1.12:
+ * Update: Updating Software Packages Using Catalogs [#153037], kernel
+ modules [# 157554].
+ * Update: cs, sk.
* Mon Mar 27 2006 - ke(a)suse.de
- Update to version 10.1.11:
* New: it, ja, pt_BR, zh_CN, and zh_TW.
++++++ release-notes-10.1.11.tar.bz2 -> release-notes-10.1.12.tar.bz2 ++++++
++++ 8873 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Thu Mar 30 10:28:13 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 18:31:33.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 10:14:11.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 30 10:13:24 CEST 2006 - kkaempf(a)suse.de
+
+- prepare for "query-pool" helper.
+- treat "@system" catalog as subscribed.
+- rev 2779
+
+--------------------------…
[View More]-----------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.a9JRcB/_old 2006-03-30 10:28:02.000000000 +0200
+++ /var/tmp/diff_new_pack.a9JRcB/_new 2006-03-30 10:28:02.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1
-Release: 22
+Release: 23
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -68,6 +68,10 @@
/etc/logrotate.d/zmd-backend
%changelog -n libzypp-zmd-backend
+* Thu Mar 30 2006 - kkaempf(a)suse.de
+- prepare for "query-pool" helper.
+- treat "@system" catalog as subscribed.
+- rev 2779
* Wed Mar 29 2006 - kkaempf(a)suse.de
- always treat zmd sources as 'remote' (#160402)
- rev 2757
++++++ zmd-backend-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.am new/zmd-backend-7.1.1/src/Makefile.am
--- old/zmd-backend-7.1.1/src/Makefile.am 2006-03-28 22:17:23.000000000 +0200
+++ new/zmd-backend-7.1.1/src/Makefile.am 2006-03-30 10:10:42.000000000 +0200
@@ -14,6 +14,7 @@
bindir = $(libdir)/zmd
bin_PROGRAMS = \
+ query-pool \
query-system \
query-files \
resolve-dependencies \
@@ -23,6 +24,7 @@
update-status \
transact
+query_pool_SOURCES = query-pool.cc zmd-backend.cc
query_system_SOURCES = query-system.cc zmd-backend.cc
query_files_SOURCES = query-files.cc zmd-backend.cc
resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.in new/zmd-backend-7.1.1/src/Makefile.in
--- old/zmd-backend-7.1.1/src/Makefile.in 2006-03-28 22:22:07.000000000 +0200
+++ new/zmd-backend-7.1.1/src/Makefile.in 2006-03-30 10:10:45.000000000 +0200
@@ -38,10 +38,10 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = query-system$(EXEEXT) query-files$(EXEEXT) \
- resolve-dependencies$(EXEEXT) package-files$(EXEEXT) \
- parse-metadata$(EXEEXT) find-file$(EXEEXT) \
- update-status$(EXEEXT) transact$(EXEEXT)
+bin_PROGRAMS = query-pool$(EXEEXT) query-system$(EXEEXT) \
+ query-files$(EXEEXT) resolve-dependencies$(EXEEXT) \
+ package-files$(EXEEXT) parse-metadata$(EXEEXT) \
+ find-file$(EXEEXT) update-status$(EXEEXT) transact$(EXEEXT)
subdir = src
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -79,6 +79,11 @@
query_files_LDADD = $(LDADD)
query_files_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_2)
+am_query_pool_OBJECTS = query-pool.$(OBJEXT) zmd-backend.$(OBJEXT)
+query_pool_OBJECTS = $(am_query_pool_OBJECTS)
+query_pool_LDADD = $(LDADD)
+query_pool_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_2)
am_query_system_OBJECTS = query-system.$(OBJEXT) zmd-backend.$(OBJEXT)
query_system_OBJECTS = $(am_query_system_OBJECTS)
query_system_LDADD = $(LDADD)
@@ -123,12 +128,14 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \
$(parse_metadata_SOURCES) $(query_files_SOURCES) \
- $(query_system_SOURCES) $(resolve_dependencies_SOURCES) \
- $(transact_SOURCES) $(update_status_SOURCES)
+ $(query_pool_SOURCES) $(query_system_SOURCES) \
+ $(resolve_dependencies_SOURCES) $(transact_SOURCES) \
+ $(update_status_SOURCES)
DIST_SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \
$(parse_metadata_SOURCES) $(query_files_SOURCES) \
- $(query_system_SOURCES) $(resolve_dependencies_SOURCES) \
- $(transact_SOURCES) $(update_status_SOURCES)
+ $(query_pool_SOURCES) $(query_system_SOURCES) \
+ $(resolve_dependencies_SOURCES) $(transact_SOURCES) \
+ $(update_status_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
@@ -293,6 +300,7 @@
AM_CXXFLAGS = $(PKG_MANAGEMENT_CFLAGS) $(SQLITE_CFLAGS) $(ZYPP_CFLAGS)
LDADD = $(PKG_MANAGEMENT_LIBS) $(SQLITE_LIBS) $(ZYPP_LIBS)
noinst_HEADERS = zmd-backend.h
+query_pool_SOURCES = query-pool.cc zmd-backend.cc
query_system_SOURCES = query-system.cc zmd-backend.cc
query_files_SOURCES = query-files.cc zmd-backend.cc
resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc
@@ -374,6 +382,9 @@
query-files$(EXEEXT): $(query_files_OBJECTS) $(query_files_DEPENDENCIES)
@rm -f query-files$(EXEEXT)
$(CXXLINK) $(query_files_LDFLAGS) $(query_files_OBJECTS) $(query_files_LDADD) $(LIBS)
+query-pool$(EXEEXT): $(query_pool_OBJECTS) $(query_pool_DEPENDENCIES)
+ @rm -f query-pool$(EXEEXT)
+ $(CXXLINK) $(query_pool_LDFLAGS) $(query_pool_OBJECTS) $(query_pool_LDADD) $(LIBS)
query-system$(EXEEXT): $(query_system_OBJECTS) $(query_system_DEPENDENCIES)
@rm -f query-system$(EXEEXT)
$(CXXLINK) $(query_system_LDFLAGS) $(query_system_OBJECTS) $(query_system_LDADD) $(LIBS)
@@ -397,6 +408,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/package-files.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-metadata.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-files.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-pool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-system.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve-dependencies.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transact.Po@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbSources.cc new/zmd-backend-7.1.1/src/dbsource/DbSources.cc
--- old/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-29 06:31:17.000000000 +0200
+++ new/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-30 09:52:59.000000000 +0200
@@ -122,7 +122,9 @@
<< ", subs " << subscribed
<< endl;
- if (subscribed == 0) {
+ if (id != "@system"
+ && subscribed == 0)
+ {
MIL << "Not subscribed, skipping" << endl;
continue;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc
--- old/zmd-backend-7.1.1/src/query-pool.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 10:11:59.000000000 +0200
@@ -0,0 +1,156 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+#include <iostream>
+
+#include "zmd-backend.h"
+
+#include <zypp/ZYpp.h>
+#include <zypp/ZYppFactory.h>
+#include <zypp/SourceManager.h>
+#include <zypp/base/Logger.h>
+#include <zypp/base/Exception.h>
+
+using namespace std;
+using namespace zypp;
+
+#include <sqlite3.h>
+#include "dbsource/DbAccess.h"
+
+#undef ZYPP_BASE_LOGGER_LOGGROUP
+#define ZYPP_BASE_LOGGER_LOGGROUP "query-pool"
+
+//-----------------------------------------------------------------------------
+
+static void
+sync_sources( sqlite3 *db )
+{
+ const char *query =
+ "CREATE TABLE zsources ("
+ "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "
+ "zmd_id INTEGER DEFAULT 0, " // reference to catalogs table for zmd, 0 for zypp
+ "alias VARCHAR, "
+ "type VARCHAR, "
+ "url VARCHAR, "
+ "path VARCHAR "
+ ")";
+
+ int rc = sqlite3_exec( db, query, NULL, NULL, NULL );
+ if (rc != SQLITE_OK) {
+ ERR << "Can not create 'zsources'[" << rc << "]: " << sqlite3_errmsg( db ) << endl;
+ ERR << query << endl;
+// ignore error, possibly already exists return;
+ }
+
+ // 1
+ query = "SELECT id FROM zsources WHERE zmd_id = 0 AND alias = ?";
+
+ sqlite3_stmt *select_h = NULL;
+ rc = sqlite3_prepare( db, query, -1, &select_h, NULL );
+ if (rc != SQLITE_OK) {
+ ERR << "Can not create select query: " << sqlite3_errmsg( db ) << endl;
+ return;
+ }
+
+ // 1 2 3 4
+ query = "INSERT INTO zsources (alias, type, url, path) VALUES (?, ?, ?, ?)";
+
+ sqlite3_stmt *insert_h = NULL;
+ rc = sqlite3_prepare( db, query, -1, &insert_h, NULL );
+ if (rc != SQLITE_OK) {
+ ERR << "Can not create insert query: " << sqlite3_errmsg( db ) << endl;
+ return;
+ }
+
+ SourceManager_Ptr manager = SourceManager::sourceManager();
+
+ try {
+ manager->restore( "/" );
+ }
+ catch (Exception & excpt_r) {
+ ZYPP_CAUGHT( excpt_r );
+ ERR << "Couldn't restore sources" << endl;
+ return;
+ }
+
+ std::list<SourceManager::SourceId> sources = manager->allSources();
+ MIL << "Found " << sources.size() << " sources" << endl;
+
+ for (std::list<SourceManager::SourceId>::const_iterator it = sources.begin(); it != sources.end(); ++it) {
+ Source_Ref source = manager->findSource( *it );
+
+ if (!source) {
+ ERR << "SourceManager can't find source " << *it << endl;
+ continue;
+ }
+
+
+ sqlite3_bind_text( select_h, 1, source.alias().c_str(), -1, SQLITE_STATIC );
+ rc = sqlite3_step( select_h );
+
+ bool found = false;
+ if (rc == SQLITE_ROW) {
+ found = true;
+ DBG << "Source '" << source.alias() << "' already synched" << endl;
+ }
+ else if (rc != SQLITE_DONE) {
+ ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl;
+ break;
+ }
+ sqlite3_reset( select_h );
+
+ if (!found) {
+ DBG << "Syncing source '" << source.alias() << "'" << endl;
+ sqlite3_bind_text( insert_h, 1, source.alias().c_str(), -1, SQLITE_STATIC );
+ std::string type = source.type();
+ if (type.empty()) type = "YaST";
+ sqlite3_bind_text( insert_h, 2, type.c_str(), -1, SQLITE_STATIC );
+ sqlite3_bind_text( insert_h, 3, source.url().asString().c_str(), -1, SQLITE_STATIC );
+ sqlite3_bind_text( insert_h, 4, source.path().asString().c_str(), -1, SQLITE_STATIC );
+ rc = sqlite3_step( insert_h );
+ if (rc != SQLITE_DONE) {
+ ERR << "rc " << rc << ": " << sqlite3_errmsg( db ) << endl;
+ break;
+ }
+ sqlite3_reset( insert_h );
+ }
+ }
+ return;
+}
+
+//-----------------------------------------------------------------------------
+
+int
+main (int argc, char **argv)
+{
+ if (argc != 2) {
+ std::cerr << "usage: " << argv[0] << " <database>" << endl;
+ return 1;
+ }
+
+ const char *logfile = getenv("ZYPP_LOGFILE");
+ if (logfile != NULL)
+ zypp::base::LogControl::instance().logfile( logfile );
+ else
+ zypp::base::LogControl::instance().logfile( ZMD_BACKEND_LOG );
+
+ MIL << "-------------------------------------" << endl;
+ MIL << "START query-pool " << argv[1] << endl;
+
+ ZYpp::Ptr God = backend::getZYpp();
+ Target_Ptr target = backend::initTarget( God );
+
+ DbAccess db( argv[1] );
+ if (!db.openDb( true ))
+ return 1;
+
+ db.writeStore( God->target()->resolvables(), ResStatus::installed, "@system" );
+
+ // sync SourceManager with sources table
+ sync_sources( db.db() );
+
+ db.closeDb();
+
+ MIL << "END query-pool" << endl;
+
+ return 0;
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package zmd
checked in at Thu Mar 30 10:27:58 CEST 2006.
--------
--- zmd/zmd.changes 2006-03-29 03:48:47.000000000 +0200
+++ zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Mar 30 10:10:52 CEST 2006 - aj(a)suse.de
+
+- Package /var/run/zmd [#162079].
+
+-------------------------------------------------------------------
+Thu Mar 30 04:03:14 CEST 2006 - maw(a)suse.de
+
+- Teach zmd to restart when it's updated (#…
[View More]162043).
+
+-------------------------------------------------------------------
+Thu Mar 30 02:42:17 CEST 2006 - thunder(a)suse.de
+
+- New source drop (r26462) which:
+- Adds arch filtering (#158187).
+- Expires the web cache after refresh.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.AL1v0j/_old 2006-03-30 10:27:10.000000000 +0200
+++ /var/tmp/diff_new_pack.AL1v0j/_new 2006-03-30 10:27:10.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel
URL: http://www.novell.com
Version: 7.1.1
-Release: 32
+Release: 33
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-7.1.1.tar.bz2
@@ -97,6 +97,7 @@
rm -rf $RPM_BUILD_ROOT/%{_libdir}/zmd/parse-metadata
# ugh(2)!
mkdir -p $RPM_BUILD_ROOT/var/cache/zmd
+mkdir -p $RPM_BUILD_ROOT/var/run/zmd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -105,6 +106,7 @@
%{insserv_force_if_yast novell-zmd}
%postun
+%{restart_on_update zmd}
%{insserv_cleanup}
%files -f %{name}.lang
@@ -146,6 +148,7 @@
%{_datadir}/zmd
# XXX: should /var be replaced by a macro?
%dir /var/cache/zmd
+%attr(755, root,root) /var/run/zmd
%files devel
%defattr(-, root, root)
@@ -153,6 +156,14 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Thu Mar 30 2006 - aj(a)suse.de
+- Package /var/run/zmd [#162079].
+* Thu Mar 30 2006 - maw(a)suse.de
+- Teach zmd to restart when it's updated (#162043).
+* Thu Mar 30 2006 - thunder(a)suse.de
+- New source drop (r26462) which:
+- Adds arch filtering (#158187).
+- Expires the web cache after refresh.
* Wed Mar 29 2006 - maw(a)suse.de
- New source drop (r26368) which:
- Makes sure there is sufficient disk space before downloading
++++++ zmd-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog
--- old/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200
+++ new/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200
@@ -1,3 +1,14 @@
+2006-03-29 Chris Rivera <cmr(a)ximian.com>
+
+ * linux/PackageManager.cs: Add arch filtering for QueryLatest and
+ GetLatestVersion.
+
+2006-03-28 James Willcox <james(a)ximian.com>
+
+ * linux/RPMBackend.cs: only delay loading the installed packages
+ when the db changes outsize of zmd. After transactions, do it
+ immediately.
+
2006-03-28 James Willcox <james(a)ximian.com>
* linux/Transaction.cs: check to make sure we have enough disk
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs
--- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-25 01:29:42.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-03-29 17:32:10.000000000 +0200
@@ -49,19 +49,6 @@
public event EventHandler InstalledPackagesChanged;
public void OnInstalledPackagesChanged () {
- lock (this) {
- if (delayedSchedule != null) {
- ScheduleManager.Instance.RemoveSchedule (delayedSchedule);
- delayedSchedule = null;
- }
- delayedSchedule = new SimpleSchedule ("Package DB changed delay");
- delayedSchedule.Triggered += DelayedInstalledPackagesChanged;
- delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30);
- ScheduleManager.Instance.AddSchedule (delayedSchedule);
- }
- }
-
- private void DelayedInstalledPackagesChanged (object o, EventArgs args) {
if (InstalledPackagesChanged != null)
InstalledPackagesChanged (this, null);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs
--- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-29 02:07:30.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200
@@ -141,27 +141,12 @@
}
public static Package GetLatestVersion (string name, bool subscribedOnly) {
- // Find latest installed version
- Package latestInstalled = null;
- foreach (Package pkg in Query ("Name", QueryType.Equal, name, QueryType.And,
- "IsInstalled", QueryType.Equal, true)) {
- if (latestInstalled == null || pkg.CompareTo (latestInstalled) > 0)
- latestInstalled = pkg;
+ IEnumerable pkgs = Query ("Name", "is", name, "and", "IsSubscribed", "is", subscribedOnly);
+ foreach (Package pkg in FilterPackagesForArch (pkgs)) {
+ return pkg;
}
- // Find latest version
- Package latest = null;
- foreach (Package pkg in Query ("Name", QueryType.Equal, name,
- QueryType.And,
- "IsSubscribed", QueryType.Equal, subscribedOnly)) {
- if (latestInstalled != null && latestInstalled.CompareTo (pkg) >= 0)
- continue;
-
- if (latest == null || pkg.CompareTo (latest) > 0)
- latest = pkg;
- }
-
- return latest;
+ return null;
}
public static ResolverResult Verify () {
@@ -319,6 +304,72 @@
return packages.Query (query);
}
+ // -1: old package 0: update 1: new install
+ private static int GetPackageStatus (Package pkg) {
+ foreach (Package p in installed.Query ("Name", "is", pkg.Name, "and", "IsInstalled", "is", true, "and",
+ "Arch", "is", pkg.Arch)) {
+ return pkg.CompareTo (p) > 0 ? 0 : -1;
+ }
+
+ return 1;
+ }
+
+ /*
+ * This function returns all updates for all arches and at most one "best"
+ * installation per package name.
+ */
+ private static IEnumerable FilterPackagesForArch (IEnumerable list) {
+ Hashtable installs = new Hashtable ();
+ Hashtable updates = new Hashtable ();
+
+ foreach (IResolvable res in list) {
+ Package pkg = res as Package;
+ if (pkg == null)
+ continue;
+
+ int pkgScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, pkg.Arch);
+ if (pkgScore < 0)
+ continue;
+
+ int packageStatus = GetPackageStatus (pkg);
+ if (packageStatus == 0) {
+ string key = String.Format ("{0}.{1}", pkg.Name, pkg.Arch);
+ Package existing = updates[key] as Package;
+ if (existing == null || pkg.CompareTo (existing) > 0) {
+ updates[key] = pkg;
+ }
+ } else if (packageStatus == 1) {
+ Package existing = installs[pkg.Name] as Package;
+ if (existing == null) {
+ installs[pkg.Name] = pkg;
+ } else {
+ int exScore = ArchUtility.GetCompatability (DaemonProperties.Target.Arch, existing.Arch);
+ if (pkgScore == 0 && exScore == 0) {
+ if (pkg.CompareTo (existing) > 0) {
+ installs[pkg.Name] = pkg;
+ }
+ } else if (pkgScore == 0) {
+ installs[pkg.Name] = pkg;
+ } else if (exScore != 0) {
+ installs[pkg.Name] = pkgScore > exScore ? pkg : existing;
+ }
+ }
+ }
+ }
+
+ // We want to remove installs for packages we are going to upgrade
+ ArrayList ret = new ArrayList ();
+ foreach (Package up in updates.Values) {
+ if (installs[up.Name] != null) {
+ installs.Remove (up.Name);
+ }
+ }
+
+ ret.AddRange (updates.Values);
+ ret.AddRange (installs.Values);
+ return ret;
+ }
+
public static ICollection FilterResolvables (IEnumerable list) {
Hashtable hash = new Hashtable ();
Backend be = Backend.Current;
@@ -334,7 +385,7 @@
}
public static IEnumerable QueryLatest (IList query) {
- return FilterResolvables (packages.Query (query));
+ return FilterPackagesForArch (packages.Query (query));
}
public static Package QueryFile (string path) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/modules/linux/RPMBackend.cs new/zmd-7.1.1/modules/linux/RPMBackend.cs
--- old/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-16 16:53:22.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/RPMBackend.cs 2006-03-29 17:32:10.000000000 +0200
@@ -2,6 +2,7 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
+using Novell.Zenworks.Zmd.Scheduling;
using log4net;
@@ -9,6 +10,7 @@
public abstract class RPMBackend : Backend {
private FileSystemWatcher watcher;
private bool ignoring;
+ private SimpleSchedule delayedSchedule;
private static bool useLibrpm = true;
private static readonly ILog log = LogManager.GetLogger (typeof (RPMBackend));
@@ -179,8 +181,21 @@
}
private void Changed (object sender, FileSystemEventArgs e) {
- if (!ignoring) {
- OnInstalledPackagesChanged ();
+ if (ignoring)
+ return;
+
+ lock (this) {
+ if (delayedSchedule != null) {
+ ScheduleManager.Instance.RemoveSchedule (delayedSchedule);
+ delayedSchedule = null;
+ }
+ delayedSchedule = new SimpleSchedule ("Package DB changed delay");
+ delayedSchedule.Triggered += delegate {
+ OnInstalledPackagesChanged ();
+ };
+
+ delayedSchedule.StartTime = DateTime.Now + TimeSpan.FromSeconds (30);
+ ScheduleManager.Instance.AddSchedule (delayedSchedule);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/po/zmd.pot new/zmd-7.1.1/po/zmd.pot
--- old/zmd-7.1.1/po/zmd.pot 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/zmd.pot 2006-03-30 02:30:58.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-29 19:30-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -102,16 +102,16 @@
msgid "Save transaction history and changed files, allowing rollback"
msgstr ""
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
+#: modules/linux/PackageManager.cs:155 modules/linux/PackageManager.cs:163
+#: modules/linux/PackageManager.cs:246 modules/linux/PackageManager.cs:273
msgid "Another transaction is already running."
msgstr ""
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:243 modules/linux/PackageManager.cs:268
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:408
msgid "File list not available."
msgstr ""
@@ -696,12 +696,12 @@
msgid "Refreshing Services"
msgstr ""
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr ""
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs
--- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-27 00:42:20.000000000 +0200
+++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/opt/zypp";
- public const string SYSCONFDIR = "/opt/zypp/etc";
- public const string DATADIR = "/opt/zypp/share";
- public const string LIBDIR = "/opt/zypp/lib";
- public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib";
- public const string LOCALSTATEDIR = "/opt/zypp/var";
+ public const string PREFIX = "/usr";
+ public const string SYSCONFDIR = "/etc";
+ public const string DATADIR = "/usr/share";
+ public const string LIBDIR = "/usr/lib64";
+ public const string LIBDIR_MANAGED = "/usr" + "/lib";
+ public const string LOCALSTATEDIR = "/var";
- public const string LOGDIR = "/opt/zypp/var/log";
+ public const string LOGDIR = "/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog
--- old/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200
+++ new/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200
@@ -1,3 +1,7 @@
+2006-03-29 James Willcox <james(a)ximian.com>
+
+ * ServiceManager.cs: expire the cache after refresh
+
2006-03-28 James Willcox <james(a)ximian.com>
* DaemonProperties.cs: add MonoVersion property, which uses evil
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1/src/ServiceManager.cs new/zmd-7.1.1/src/ServiceManager.cs
--- old/zmd-7.1.1/src/ServiceManager.cs 2006-03-27 02:51:26.000000000 +0200
+++ new/zmd-7.1.1/src/ServiceManager.cs 2006-03-30 02:26:02.000000000 +0200
@@ -559,6 +559,7 @@
public static void OnRefreshFinished (Progress progress) {
WebCache.ForceCache = false;
+ WebCache.Expire ();
if (progress.Status == ProgressStatus.Finished) {
log.Info ("Finished Service Refresh");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package zen-updater
checked in at Thu Mar 30 00:47:29 CEST 2006.
--------
--- zen-updater/zen-updater.changes 2006-03-28 14:00:20.000000000 +0200
+++ zen-updater/zen-updater.changes 2006-03-29 21:32:43.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Mar 29 04:17:43 CEST 2006 - maw(a)suse.de
+
+- New source drop (r26362) which:
+- Moves the autostart stuff to /etc/xdg
+- Implements autostart handling of XDG_CONFIG_DIRS
+- Fixes localization.
+
+---------…
[View More]----------------------------------------------------------
Old:
----
etc-xdg-autostart.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zen-updater.spec ++++++
--- /var/tmp/diff_new_pack.7qQeLA/_old 2006-03-30 00:47:17.000000000 +0200
+++ /var/tmp/diff_new_pack.7qQeLA/_new 2006-03-30 00:47:17.000000000 +0200
@@ -14,13 +14,12 @@
BuildRequires: glib-sharp2 gtk-sharp2 gtk2-devel log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files zmd-devel
URL: http://novell.com/
Version: 7.1.0
-Release: 25
+Release: 26
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
Source1: %name-po.tar.bz2
Patch0: zen-updater-transparent-trayicon.patch
-Patch1: etc-xdg-autostart.diff
Summary: Novell ZENworks Linux Management daemon
Group: System/Management
Autoreqprov: on
@@ -41,7 +40,6 @@
%setup -q -a1
sed -i 's/^ALL_LINGUAS="/&ar bg bn br bs ca cs cy da de el_GR es fi fr gl he hi hr hu id it ja ka km ko lo lt nb nl pa pl pt_BR pt ro ru sk sl_SI sr sv ta tr uk zh_CN zh zh_TW /' configure.in configure
%patch0 -p0
-%patch1
%build
CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="-w" \
@@ -76,6 +74,11 @@
%{_mandir}/*/*
%changelog -n zen-updater
+* Wed Mar 29 2006 - maw(a)suse.de
+- New source drop (r26362) which:
+- Moves the autostart stuff to /etc/xdg
+- Implements autostart handling of XDG_CONFIG_DIRS
+- Fixes localization.
* Tue Mar 28 2006 - sbrabec(a)suse.cz
- Added Hungarian translation and partial translations for other
languages (#153732).
++++++ zen-updater-7.1.0.tar.bz2 ++++++
++++ 4567 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package banshee
checked in at Thu Mar 30 00:47:13 CEST 2006.
--------
--- GNOME/banshee/banshee.changes 2006-03-27 22:08:28.000000000 +0200
+++ banshee/banshee.changes 2006-03-29 19:02:56.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 29 19:02:21 CEST 2006 - gekker(a)suse.de
+
+- Add mDNSResponder mDNSResponder-devel to BuildRequires
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++…
[View More]++++++++++++++++++++++++++++
Other differences:
------------------
++++++ banshee.spec ++++++
--- /var/tmp/diff_new_pack.cCfdhb/_old 2006-03-30 00:47:03.000000000 +0200
+++ /var/tmp/diff_new_pack.cCfdhb/_new 2006-03-30 00:47:03.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: banshee
-BuildRequires: dbus-1-mono gcc-c++ gconf-sharp2 gdk-pixbuf-devel glade-sharp2 gnome-desktop-devel gnome-sharp2 gstreamer-plugins-devel gstreamer-plugins-extra gtk-sharp2-gapi intltool ipod-sharp libglade2-devel libidl-devel libmusicbrainz-devel libnjb-devel libwnck-devel mono-basic mono-data-sqlite monodoc-core nautilus-cd-burner-devel njb-sharp perl-XML-Parser sqlite-devel update-desktop-files
+BuildRequires: dbus-1-mono gcc-c++ gconf-sharp2 gdk-pixbuf-devel glade-sharp2 gnome-desktop-devel gnome-sharp2 gstreamer-plugins-devel gstreamer-plugins-extra gtk-sharp2-gapi intltool ipod-sharp libglade2-devel libidl-devel libmusicbrainz-devel libnjb-devel libwnck-devel mDNSResponder mDNSResponder-devel mono-basic mono-data-sqlite monodoc-core nautilus-cd-burner-devel njb-sharp perl-XML-Parser sqlite-devel update-desktop-files
%define prefix /usr
%define sysconfdir /etc/opt/gnome
%define gstreamerprefix /opt/gnome
@@ -22,7 +22,7 @@
PreReq: filesystem gconf2
Requires: mono-core
Version: 0.10.8
-Release: 8
+Release: 10
Source0: banshee-%{version}.tar.gz
Patch0: %{name}-libaoss-preload.patch
Patch1: %{name}.exe.config.in.patch
@@ -286,6 +286,8 @@
%{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll*
%changelog -n banshee
+* Wed Mar 29 2006 - gekker(a)suse.de
+- Add mDNSResponder mDNSResponder-devel to BuildRequires
* Mon Mar 27 2006 - gekker(a)suse.de
- Split out DAAP plugin and mDNSResponder dep (#160630)
* Sun Mar 19 2006 - danw(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2
checked in at Wed Mar 29 21:21:31 CEST 2006.
--------
--- yast2/yast2.changes 2006-03-29 17:04:40.000000000 +0200
+++ yast2/yast2.changes 2006-03-29 21:20:35.000000000 +0200
@@ -2,11 +1,0 @@
-Wed Mar 29 17:04:09 CEST 2006 - mvidner(a)suse.cz
-
-- Added PackageLock, a module to handle the big Zypp lock (#160319).
-- 2.13.41
-
--------------------------------------------------------------------
-Mon Mar 27 10:24:51 CEST 2006 - …
[View More]locilka(a)suse.cz
-
-- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
-
--------------------------------------------------------------------
Old:
----
yast2-2.13.41.tar.bz2
New:
----
yast2-2.13.40.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.6aVrLy/_old 2006-03-29 21:21:17.000000000 +0200
+++ /var/tmp/diff_new_pack.6aVrLy/_new 2006-03-29 21:21:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.13.41)
+# spec file for package yast2 (Version 2.13.40)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,24 +11,22 @@
# norootforbuild
Name: yast2
-Version: 2.13.41
-Release: 1
+Version: 2.13.40
+Release: 3
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.13.41.tar.bz2
+Source0: yast2-2.13.40.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
Requires: yast2-core >= 2.7.1
-# Pkg::Connect
-Requires: yast2-pkg-bindings >= 2.13.43
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
# for ag_tty (/bin/stty)
Requires: coreutils
-Requires: yast2-xml, yast2-hardware-detection
+Requires: yast2-pkg-bindings, yast2-xml, yast2-hardware-detection
Requires: SuSEfirewall2
Provides: yast2-lib-sequencer
Obsoletes: yast2-lib-sequencer
@@ -93,7 +91,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.13.41
+%setup -n yast2-2.13.40
%build
%{prefix}/bin/y2tool y2autoconf
@@ -192,11 +190,6 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
-* Wed Mar 29 2006 - mvidner(a)suse.cz
-- Added PackageLock, a module to handle the big Zypp lock (#160319).
-- 2.13.41
-* Mon Mar 27 2006 - locilka(a)suse.cz
-- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
* Wed Mar 22 2006 - locilka(a)suse.cz
- better testing of UTF-8 support using the testutf8 binary
(#158001)
++++++ yast2-2.13.41.tar.bz2 -> yast2-2.13.40.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/Makefile.am new/yast2-2.13.40/Makefile.am
--- old/yast2-2.13.41/Makefile.am 2006-03-29 17:06:25.000000000 +0200
+++ new/yast2-2.13.40/Makefile.am 2006-03-22 13:03:49.000000000 +0100
@@ -154,7 +154,7 @@
$(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 = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/Makefile.in new/yast2-2.13.40/Makefile.in
--- old/yast2-2.13.41/Makefile.in 2006-03-29 17:07:07.000000000 +0200
+++ new/yast2-2.13.40/Makefile.in 2006-03-22 13:04:04.000000000 +0100
@@ -789,7 +789,7 @@
$(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
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -832,9 +832,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/VERSION new/yast2-2.13.40/VERSION
--- old/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200
+++ new/yast2-2.13.40/VERSION 2006-03-22 13:01:38.000000000 +0100
@@ -1 +1 @@
-2.13.41
+2.13.40
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/base.pot new/yast2-2.13.40/base.pot
--- old/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100
+++ new/yast2-2.13.40/base.pot 2006-02-07 16:03:17.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 16:33+0100\n"
+"POT-Creation-Date: 2006-02-07 16:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -258,53 +258,53 @@
msgstr ""
#. translators: progress message - command line interface ready
-#: library/commandline/src/CommandLine.ycp:1263
+#: library/commandline/src/CommandLine.ycp:1258
msgid "Ready"
msgstr ""
#. non-GUI handling
-#: library/commandline/src/CommandLine.ycp:1287
+#: library/commandline/src/CommandLine.ycp:1282
msgid "Initializing"
msgstr ""
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/CommandLine.ycp:1326
+#: library/commandline/src/CommandLine.ycp:1321
msgid "Finishing"
msgstr ""
#. translators: The command line interface is finished
-#: library/commandline/src/CommandLine.ycp:1333
+#: library/commandline/src/CommandLine.ycp:1328
msgid "Done"
msgstr ""
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/CommandLine.ycp:1336
+#: library/commandline/src/CommandLine.ycp:1331
msgid "Quitting (without changes)"
msgstr ""
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/CommandLine.ycp:1351
-msgid "yes/no?: "
+#: library/commandline/src/CommandLine.ycp:1346
+msgid "yes or no?"
msgstr ""
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1356
+#: library/commandline/src/CommandLine.ycp:1351
msgid "yes"
msgstr ""
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1359
+#: library/commandline/src/CommandLine.ycp:1354
msgid "no"
msgstr ""
#. error report
-#: library/control/src/ProductControl.ycp:811
+#: library/control/src/ProductControl.ycp:813
msgid "No workflow defined for this installation mode."
msgstr ""
#. message popup, %1 is a label of some widget
-#: library/cwm/src/CWM.ycp:630
+#: library/cwm/src/CWM.ycp:626
#, ycp-format
msgid "The value of %1 is invalid."
msgstr ""
@@ -598,37 +598,37 @@
msgstr ""
#. combobox header
-#: library/cwm/src/TablePopup.ycp:413
+#: library/cwm/src/TablePopup.ycp:417
msgid "&Selected Option"
msgstr ""
#. heading / label
-#: library/cwm/src/TablePopup.ycp:459
+#: library/cwm/src/TablePopup.ycp:463
msgid "Current Option: "
msgstr ""
#. error report
-#: library/cwm/src/TablePopup.ycp:652
+#: library/cwm/src/TablePopup.ycp:663
msgid "The selected option is already present."
msgstr ""
#. table header, shortcut for changed, keep very short
-#: library/cwm/src/TablePopup.ycp:823
+#: library/cwm/src/TablePopup.ycp:835
msgid "Ch."
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830
+#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842
msgid "Option"
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832
+#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844
msgid "Value"
msgstr ""
#. help 1/4
-#: library/cwm/src/TablePopup.ycp:836
+#: library/cwm/src/TablePopup.ycp:848
msgid ""
"<p><b><big>Editing the Settings</big></b><br>\n"
"To edit the settings, choose the appropriate\n"
@@ -636,21 +636,21 @@
msgstr ""
#. help 2/4, optional
-#: library/cwm/src/TablePopup.ycp:841
+#: library/cwm/src/TablePopup.ycp:853
msgid ""
"<p>To add a new option, click <b>Add</b>. To remove\n"
"an option, select it and click <b>Delete</b>.</p>"
msgstr ""
#. help 3/4, optional
-#: library/cwm/src/TablePopup.ycp:846
+#: library/cwm/src/TablePopup.ycp:858
msgid ""
"<P>The <B>Ch.</B> column of the table shows \n"
"whether the option was changed.</P>"
msgstr ""
#. help 4/4, optional
-#: library/cwm/src/TablePopup.ycp:851
+#: library/cwm/src/TablePopup.ycp:863
msgid ""
"<p>To reorder the options, select an option\n"
"and use <b>Up</b> and <b>Down</b> to move it up or down\n"
@@ -659,12 +659,12 @@
#. push button
#. Button label
-#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184
+#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184
msgid "&Up"
msgstr ""
#. push button
-#: library/cwm/src/TablePopup.ycp:861
+#: library/cwm/src/TablePopup.ycp:873
msgid "&Down"
msgstr ""
@@ -1277,43 +1277,176 @@
msgid "All changes will be lost!"
msgstr ""
+#. translators: summary header for messages generated through autoinstallation
+#: library/modules/Report.ycp:81
+msgid "Messages"
+msgstr ""
+
+#. Report configuration - will be normal messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/modules/Report.ycp:86
+#, ycp-format
+msgid "Display Messages: %1"
+msgstr ""
+
+#. translators: summary if the messages should be displayed
+#. translators: summary if the messages should be written to log file
+#. translators: summary if the warnings should be displayed
+#. translators: summary if the warnings should be written to log file
+#. translators: summary if the errors should be displayed
+#. translators: summary if the errors should be written to log file
+#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
+#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
+#: library/modules/Report.ycp:122 library/modules/Report.ycp:130
+msgid "Yes"
+msgstr ""
+
+#. translators: summary if the errors should be written to log file
+#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
+#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
+#: library/modules/Report.ycp:122 library/modules/Report.ycp:132
+msgid "No"
+msgstr ""
+
+#. Report configuration - will have normal messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/modules/Report.ycp:91
+#, ycp-format
+msgid "Time-out Messages: %1"
+msgstr ""
+
+#. Report configuration - will be normal messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/modules/Report.ycp:94
+#, ycp-format
+msgid "Log Messages: %1"
+msgstr ""
+
+#. translators: summary header for warnings generated through autoinstallation
+#: library/modules/Report.ycp:99
+msgid "Warnings"
+msgstr ""
+
+#. Report configuration - will be warning messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/modules/Report.ycp:103
+#, ycp-format
+msgid "Display Warnings: %1"
+msgstr ""
+
+#. Report configuration - will have warning messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/modules/Report.ycp:108
+#, ycp-format
+msgid "Time-out Warnings: %1"
+msgstr ""
+
+#. Report configuration - will be warning messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/modules/Report.ycp:111
+#, ycp-format
+msgid "Log Warnings: %1"
+msgstr ""
+
+#. translators: summary header for errors generated through autoinstallation
+#: library/modules/Report.ycp:116
+msgid "Errors"
+msgstr ""
+
+#. Report configuration - will be error messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/modules/Report.ycp:120
+#, ycp-format
+msgid "Display Errors: %1"
+msgstr ""
+
+#. Report configuration - will have error messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/modules/Report.ycp:125
+#, ycp-format
+msgid "Time-out Errors: %1"
+msgstr ""
+
+#. Report configuration - will be error messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/modules/Report.ycp:128
+#, ycp-format
+msgid "Log Errors: %1"
+msgstr ""
+
+#. translators: warnings summary header
+#: library/modules/Report.ycp:635
+msgid "Warning:"
+msgid_plural "Warnings:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: errors summary header
+#: library/modules/Report.ycp:649
+msgid "Error:"
+msgid_plural "Errors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: message summary header
+#: library/modules/Report.ycp:663 library/modules/Report.ycp:677
+msgid "Message:"
+msgid_plural "Messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: summary if the module has not been used yet in AutoYaST profile
+#: library/modules/Summary.ycp:49
+msgid "Not configured yet."
+msgstr ""
+
+#. translators: summary if no hardware was detected
+#: library/modules/Summary.ycp:65
+msgid "Not detected."
+msgstr ""
+
#. translators: Tree header
#: library/modules/ValueBrowser.ycp:141
msgid "&Variable"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:77
+#: library/network/src/CWMFirewallInterfaces.ycp:104
msgid "Firewall is disabled"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:82
+#: library/network/src/CWMFirewallInterfaces.ycp:109
msgid "Firewall port is closed"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:87
+#: library/network/src/CWMFirewallInterfaces.ycp:114
msgid "Firewall port is open on all interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:92
+#: library/network/src/CWMFirewallInterfaces.ycp:119
msgid "Firewall port is open on selected interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:97
+#: library/network/src/CWMFirewallInterfaces.ycp:124
msgid "No network interfaces are configured"
msgstr ""
+#. multi selection box item
+#: library/network/src/CWMFirewallInterfaces.ycp:186
+msgid "All NetworkManager Interfaces"
+msgstr ""
+
#. transaltors: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:278
+#: library/network/src/CWMFirewallInterfaces.ycp:365
msgid "&Network Interfaces with Open Port in Firewall"
msgstr ""
#. question popup
-#: library/network/src/CWMFirewallInterfaces.ycp:338
+#: library/network/src/CWMFirewallInterfaces.ycp:431
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -1322,7 +1455,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:358
+#: library/network/src/CWMFirewallInterfaces.ycp:475
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1333,7 +1466,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:373
+#: library/network/src/CWMFirewallInterfaces.ycp:492
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1344,23 +1477,23 @@
msgstr ""
#. translators: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:450
+#: library/network/src/CWMFirewallInterfaces.ycp:569
msgid "Network &Interfaces with Open Port in Firewall"
msgstr ""
#. push button to select all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:459
+#: library/network/src/CWMFirewallInterfaces.ycp:578
msgid "Select &All"
msgstr ""
#. push button to deselect all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:462
+#: library/network/src/CWMFirewallInterfaces.ycp:581
msgid "Select &None"
msgstr ""
#. help text for firewall settings widget 1/3,
#. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
-#: library/network/src/CWMFirewallInterfaces.ycp:680
+#: library/network/src/CWMFirewallInterfaces.ycp:799
#, ycp-format
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
@@ -1371,7 +1504,7 @@
#. help text for firewall port openning widget 2/3, optional
#. %1 is push button label, eg. "Firewall &Details" (without quotes)
#. note: %2 is correct, do not replace with %1!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:688
+#: library/network/src/CWMFirewallInterfaces.ycp:807
#, ycp-format
msgid ""
"To select interfaces on which to open the port,\n"
@@ -1379,37 +1512,46 @@
msgstr ""
#. help text for firewall settings widget 3/3,
-#: library/network/src/CWMFirewallInterfaces.ycp:692
+#: library/network/src/CWMFirewallInterfaces.ycp:811
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
msgstr ""
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:705
+#: library/network/src/CWMFirewallInterfaces.ycp:824
msgid "Open Port in Firewall"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:707
+#: library/network/src/CWMFirewallInterfaces.ycp:826
msgid "Firewall Details"
msgstr ""
#. check box
-#: library/network/src/CWMFirewallInterfaces.ycp:736
+#: library/network/src/CWMFirewallInterfaces.ycp:855
msgid "Open Port in &Firewall"
msgstr ""
#. push button
-#: library/network/src/CWMFirewallInterfaces.ycp:739
+#: library/network/src/CWMFirewallInterfaces.ycp:858
msgid "Firewall &Details"
msgstr ""
#. label text
-#: library/network/src/CWMFirewallInterfaces.ycp:768
+#: library/network/src/CWMFirewallInterfaces.ycp:887
msgid "Firewall is open"
msgstr ""
+#. TRANSLATORS: pop-up question when reading the service configuration
+#: library/network/src/NetworkService.ycp:108
+msgid ""
+"Your network interfaces are currently controlled by NetworkManager\n"
+"but the service to configure might not work well with it.\n"
+"\n"
+"Really continue?"
+msgstr ""
+
#. TRANSLATORS: popup informing message, allowed characters for port-names
#: library/network/src/PortAliases.ycp:112
msgid ""
@@ -1419,39 +1561,39 @@
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:72
+#: library/network/src/SuSEFirewall.ycp:79
msgid "External Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:74
+#: library/network/src/SuSEFirewall.ycp:81
msgid "Internal Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:76
+#: library/network/src/SuSEFirewall.ycp:83
msgid "Demilitarized Zone"
msgstr ""
#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/SuSEFirewall.ycp:1103
+#: library/network/src/SuSEFirewall.ycp:1140
msgid "Unknown Zone"
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1323
+#: library/network/src/SuSEFirewall.ycp:1360
#, ycp-format
msgid "Cannot enable service '%1'."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1345
+#: library/network/src/SuSEFirewall.ycp:1382
#, ycp-format
msgid "Cannot disable service '%1'."
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1458
+#: library/network/src/SuSEFirewall.ycp:1497
#, ycp-format
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
@@ -1462,8 +1604,8 @@
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1730
-#: library/network/src/SuSEFirewall.ycp:1787
+#: library/network/src/SuSEFirewall.ycp:1782
+#: library/network/src/SuSEFirewall.ycp:1843
#, ycp-format
msgid ""
"Interface '%1' is not assigned to any firewall zone.\n"
@@ -1471,78 +1613,78 @@
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2111
+#: library/network/src/SuSEFirewall.ycp:2175
msgid "Initializing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2116
+#: library/network/src/SuSEFirewall.ycp:2180
msgid "Check for network devices"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2118
+#: library/network/src/SuSEFirewall.ycp:2182
msgid "Read current configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2120
+#: library/network/src/SuSEFirewall.ycp:2184
msgid "Check possibly conflicting services"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2124
+#: library/network/src/SuSEFirewall.ycp:2188
msgid "Checking for network devices..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2126
+#: library/network/src/SuSEFirewall.ycp:2190
msgid "Reading current configuration..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2128
+#: library/network/src/SuSEFirewall.ycp:2192
msgid "Checking possibly conflicting services..."
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2227
+#: library/network/src/SuSEFirewall.ycp:2291
msgid "Writing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2232
+#: library/network/src/SuSEFirewall.ycp:2296
msgid "Write firewall settings"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2234
+#: library/network/src/SuSEFirewall.ycp:2298
msgid "Adjust firewall service"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2238
+#: library/network/src/SuSEFirewall.ycp:2302
msgid "Writing firewall settings..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2240
+#: library/network/src/SuSEFirewall.ycp:2304
msgid "Adjusting firewall service..."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:2256
+#: library/network/src/SuSEFirewall.ycp:2320
msgid "Writing settings failed"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:136
+#: library/network/src/SuSEFirewallProposal.ycp:137
#, ycp-format
msgid "New network device '%1' found; added as an internal firewall interface"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:143
+#: library/network/src/SuSEFirewallProposal.ycp:144
#, ycp-format
msgid "New network device '%1' found; added as an external firewall interface"
msgstr ""
@@ -1550,7 +1692,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:330
+#: library/network/src/SuSEFirewallProposal.ycp:349
#, ycp-format
msgid "Firewall is %1enabled%2"
msgstr ""
@@ -1558,7 +1700,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:335
+#: library/network/src/SuSEFirewallProposal.ycp:354
#, ycp-format
msgid "Firewall is %1disabled%2"
msgstr ""
@@ -1566,7 +1708,7 @@
#. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:353
+#: library/network/src/SuSEFirewallProposal.ycp:384
#, ycp-format
msgid "SSH port is %1open%2"
msgstr ""
@@ -1574,20 +1716,20 @@
#. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:358
+#: library/network/src/SuSEFirewallProposal.ycp:389
#, ycp-format
msgid "SSH port is %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:364
-msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:395
+msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall."
msgstr ""
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:383
+#: library/network/src/SuSEFirewallProposal.ycp:414
#, ycp-format
msgid "Remote Administration (VNC) ports are %1open%2"
msgstr ""
@@ -1595,14 +1737,14 @@
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:388
+#: library/network/src/SuSEFirewallProposal.ycp:419
#, ycp-format
msgid "Remote Administration (VNC) ports are %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:393
-msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:424
+msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall."
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
@@ -1736,49 +1878,43 @@
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:183
+#: library/network/src/SuSEFirewallServices.ycp:185
msgid "Remote Access to Display Manager"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:191
+#: library/network/src/SuSEFirewallServices.ycp:193
msgid "Remote File Alteration Monitor"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:197
+#: library/network/src/SuSEFirewallServices.ycp:199
msgid "Portable Batch System (PBS)"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:204
+#: library/network/src/SuSEFirewallServices.ycp:206
msgid "MySQL Remote Access"
msgstr ""
#. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server
-#: library/network/src/SuSEFirewallServices.ycp:234
+#: library/network/src/SuSEFirewallServices.ycp:236
#, ycp-format
msgid "Unknown service '%1'"
msgstr ""
#. Popup when initializing the package manager
-#. popup when initializing the package manager
#: library/packages/src/PackageSystem.ycp:77
-#: library/packages/src/Require.ycp:75
msgid "Reading package information..."
msgstr ""
#. Error message, no packages sources found
-#. error popup, no packages sources
-#. FIXME: translation
#: library/packages/src/PackageSystem.ycp:99
-#: library/packages/src/Require.ycp:87
msgid "No package source defined."
msgstr ""
#. popup heading, with rich text widget and Yes/No buttons
#: library/packages/src/PackageSystem.ycp:128
-#: library/packages/src/Require.ycp:343
msgid "Do you accept this license agreement?"
msgid_plural "Do you accept these license agreements?"
msgstr[0] ""
@@ -1809,19 +1945,14 @@
"packages, YaST may not work properly.\n"
msgstr ""
-#. this is a separator used at merging package list items
-#: library/packages/src/common.ycp:83
-msgid ", "
-msgstr ""
-
#. the message is followed by list of required packages
#. Popup Text
-#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109
+#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108
msgid "These packages need to be installed:"
msgstr ""
#. Popup Text
-#: library/packages/src/common.ycp:111
+#: library/packages/src/common.ycp:110
msgid "These packages need to be removed:"
msgstr ""
@@ -1933,22 +2064,22 @@
msgstr ""
#. KiloByte abbreviated
-#: library/types/src/String.ycp:80
+#: library/types/src/String.ycp:96
msgid "KB"
msgstr ""
#. MegaByte abbreviated
-#: library/types/src/String.ycp:82
+#: library/types/src/String.ycp:98
msgid "MB"
msgstr ""
#. GigaByte abbreviated
-#: library/types/src/String.ycp:84
+#: library/types/src/String.ycp:100
msgid "GB"
msgstr ""
#. TeraByte abbreviated
-#: library/types/src/String.ycp:86
+#: library/types/src/String.ycp:102
msgid "TB"
msgstr ""
@@ -2024,134 +2155,6 @@
msgid "&Exported Directories"
msgstr ""
-#. translators: summary header for messages generated through autoinstallation
-#: library/wizard/src/Report.ycp:81
-msgid "Messages"
-msgstr ""
-
-#. Report configuration - will be normal messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/wizard/src/Report.ycp:86
-#, ycp-format
-msgid "Display Messages: %1"
-msgstr ""
-
-#. translators: summary if the messages should be displayed
-#. translators: summary if the messages should be written to log file
-#. translators: summary if the warnings should be displayed
-#. translators: summary if the warnings should be written to log file
-#. translators: summary if the errors should be displayed
-#. translators: summary if the errors should be written to log file
-#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
-#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
-#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130
-msgid "Yes"
-msgstr ""
-
-#. translators: summary if the errors should be written to log file
-#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
-#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
-#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132
-msgid "No"
-msgstr ""
-
-#. Report configuration - will have normal messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/wizard/src/Report.ycp:91
-#, ycp-format
-msgid "Time-out Messages: %1"
-msgstr ""
-
-#. Report configuration - will be normal messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/wizard/src/Report.ycp:94
-#, ycp-format
-msgid "Log Messages: %1"
-msgstr ""
-
-#. translators: summary header for warnings generated through autoinstallation
-#: library/wizard/src/Report.ycp:99
-msgid "Warnings"
-msgstr ""
-
-#. Report configuration - will be warning messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/wizard/src/Report.ycp:103
-#, ycp-format
-msgid "Display Warnings: %1"
-msgstr ""
-
-#. Report configuration - will have warning messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/wizard/src/Report.ycp:108
-#, ycp-format
-msgid "Time-out Warnings: %1"
-msgstr ""
-
-#. Report configuration - will be warning messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/wizard/src/Report.ycp:111
-#, ycp-format
-msgid "Log Warnings: %1"
-msgstr ""
-
-#. translators: summary header for errors generated through autoinstallation
-#: library/wizard/src/Report.ycp:116
-msgid "Errors"
-msgstr ""
-
-#. Report configuration - will be error messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/wizard/src/Report.ycp:120
-#, ycp-format
-msgid "Display Errors: %1"
-msgstr ""
-
-#. Report configuration - will have error messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/wizard/src/Report.ycp:125
-#, ycp-format
-msgid "Time-out Errors: %1"
-msgstr ""
-
-#. Report configuration - will be error messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/wizard/src/Report.ycp:128
-#, ycp-format
-msgid "Log Errors: %1"
-msgstr ""
-
-#. translators: warnings summary header
-#: library/wizard/src/Report.ycp:635
-msgid "Warning:"
-msgid_plural "Warnings:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: errors summary header
-#: library/wizard/src/Report.ycp:649
-msgid "Error:"
-msgid_plural "Errors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: message summary header
-#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677
-msgid "Message:"
-msgid_plural "Messages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: summary if the module has not been used yet in AutoYaST profile
-#: library/wizard/src/Summary.ycp:49
-msgid "Not configured yet."
-msgstr ""
-
-#. translators: summary if no hardware was detected
-#: library/wizard/src/Summary.ycp:65
-msgid "Not detected."
-msgstr ""
-
#. button text
#: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306
msgid "&Apply"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/configure new/yast2-2.13.40/configure
--- old/yast2-2.13.41/configure 2006-03-29 17:06:37.000000000 +0200
+++ new/yast2-2.13.40/configure 2006-03-22 13:03:53.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2 2.13.41.
+# Generated by GNU Autoconf 2.59 for yast2 2.13.40.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.13.41'
-PACKAGE_STRING='yast2 2.13.41'
+PACKAGE_VERSION='2.13.40'
+PACKAGE_STRING='yast2 2.13.40'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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 2.13.41 to adapt to many kinds of systems.
+\`configure' configures yast2 2.13.40 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.13.41:";;
+ short | recursive ) echo "Configuration of yast2 2.13.40:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.13.41
+yast2 configure 2.13.40
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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 $as_me 2.13.41, which was
+It was created by yast2 $as_me 2.13.40, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.13.41'
+ VERSION='2.13.40'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.41"
+VERSION="2.13.40"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>"
@@ -2797,7 +2797,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2 $as_me 2.13.41, which was
+This file was extended by yast2 $as_me 2.13.40, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2852,7 +2852,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.13.41
+yast2 config.status 2.13.40
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/configure.in new/yast2-2.13.40/configure.in
--- old/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200
+++ new/yast2-2.13.40/configure.in 2006-03-22 13:03:49.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2)
+AC_INIT(yast2, 2.13.40, http://www.suse.de/feedback, yast2)
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.41"
+VERSION="2.13.40"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/modules/Version.ycp new/yast2-2.13.40/library/modules/Version.ycp
--- old/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200
+++ new/yast2-2.13.40/library/modules/Version.ycp 2006-03-22 13:04:05.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.13.41";
+global string yast2 = "2.13.40";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/Makefile.am new/yast2-2.13.40/library/packages/src/Makefile.am
--- old/yast2-2.13.41/library/packages/src/Makefile.am 2006-03-28 18:46:35.000000000 +0200
+++ new/yast2-2.13.40/library/packages/src/Makefile.am 2006-02-03 08:47:25.000000000 +0100
@@ -5,7 +5,6 @@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
- PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/Makefile.in new/yast2-2.13.40/library/packages/src/Makefile.in
--- old/yast2-2.13.41/library/packages/src/Makefile.in 2006-03-29 17:06:54.000000000 +0200
+++ new/yast2-2.13.40/library/packages/src/Makefile.in 2006-03-22 13:03:59.000000000 +0100
@@ -174,7 +174,6 @@
ystartupdir = @ystartupdir@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
- PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/PackageLock.ycp new/yast2-2.13.40/library/packages/src/PackageLock.ycp
--- old/yast2-2.13.41/library/packages/src/PackageLock.ycp 2006-03-29 15:32:27.000000000 +0200
+++ new/yast2-2.13.40/library/packages/src/PackageLock.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-/**
- * File: modules/PackageLock.ycp
- * Package: yast2
- * Summary: Packages manipulation (system)
- * Authors: Martin Vidner <mvidner(a)suse.cz>
- *
- * $Id: PackageLock.ycp 29512 2006-03-29 13:32:23Z mvidner $
- *
- * This should be used everywhere before Pkg is first used. #160319
- */
-
-{
-
-module "PackageLock";
-textdomain "base";
-
-import "Report";
-
-boolean have_lock = nil;
-/**
- * Tries to acquire the packager (zypp) lock.
- * Reports an error if another process has the lock already.
- * Will only report once even if called multiple times.
- * @return true if we can continue
- */
-global boolean Check () {
- if (have_lock == nil)
- {
- // Invoke a cheap call that accesses the zypp lock
- have_lock = Pkg::Connect () == true; // nil guard
- if (!have_lock)
- {
- Report::Error (_("Another process is accessing the package database.
-Package management will not work!"));
- // ContinueCancel? What about CLI?
- }
- }
- return have_lock;
-}
-
-
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/PackageSystem.ycp new/yast2-2.13.40/library/packages/src/PackageSystem.ycp
--- old/yast2-2.13.41/library/packages/src/PackageSystem.ycp 2006-03-29 17:04:49.000000000 +0200
+++ new/yast2-2.13.40/library/packages/src/PackageSystem.ycp 2006-02-20 12:08:10.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Martin Vidner <mvidner(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $
+ * $Id: PackageSystem.ycp 27893 2006-02-13 12:08:32Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -18,7 +18,6 @@
import "Mode";
import "PackageCallbacksInit";
-import "PackageLock";
import "Report";
import "Stage";
import "CommandLine";
@@ -53,7 +52,6 @@
* This may become superfluous.
*/
global void EnsureTargetInit() {
- PackageLock::Check ();
PackageCallbacksInit::InitPackageCallbacks ();
// target_initialized = target_initialized || Pkg::TargetInit ("/", false);
// always initizalize target, it should be cheap according to #45356
@@ -64,7 +62,6 @@
* Ensure that Pkg:: calls working with the installation sources work
*/
global void EnsureSourceInit() {
- PackageLock::Check ();
if(source_initialized)
{
// this way, if somebody closed the cache outside of Package
@@ -113,11 +110,6 @@
global boolean DoInstallAndRemove(list<string> toinstall, list<string> toremove) {
y2debug ("toinstall: %1, toremove: %2", toinstall, toremove);
- if (!PackageLock::Check ())
- {
- return false;
- }
-
EnsureSourceInit ();
EnsureTargetInit ();
boolean ok = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/runlevel/src/Service.ycp new/yast2-2.13.40/library/runlevel/src/Service.ycp
--- old/yast2-2.13.41/library/runlevel/src/Service.ycp 2006-03-28 13:46:13.000000000 +0200
+++ new/yast2-2.13.40/library/runlevel/src/Service.ycp 2006-02-13 12:22:17.000000000 +0100
@@ -6,7 +6,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $
+ * $Id: Service.ycp 27885 2006-02-13 11:22:17Z locilka $
*
* Functions for service (init script) handling used by other modules.
*/
@@ -293,7 +293,7 @@
*/
global define integer RunInitScriptWithTimeOut (string name, string param) {
y2milestone("Running service initscript %1 %2", name, param);
- string command = sformat ("TERM=dumb %2/%1 %3", name, init_d, param);
+ string command = sformat ("TERM=raw %2/%1 %3", name, init_d, param);
// default return code
integer return_code = nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0