March 2006 - openSUSE Commits - openSUSE Mailing Lists

commit multipath-tools
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package multipath-tools checked in at Wed Mar 29 11:58:34 CEST 2006. -------- --- /work/SRC/all/multipath-tools/multipath-tools.changes 2006-03-14 16:40:53.000000000 +0100 +++ /work/src/done/STABLE/multipath-tools/multipath-tools.changes 2006-03-29 09:28:32.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Mar 29 09:27:50 CEST 2006 - hare(a)suse.de + +- Explicitely create partitions at boot time (#159927) + +------------------------------------------------------------------- +Thu Mar 23 11:36:25 CET 2006 - hare(a)suse.de + +- Add hwtable entry for IBM 3526. + +------------------------------------------------------------------- New: ---- multipath-tools-ibm-3526-update ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.aOMIoM/_old 2006-03-29 11:58:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aOMIoM/_new 2006-03-29 11:58:12.000000000 +0200 @@ -20,7 +20,7 @@ %endif Autoreqprov: on Version: 0.4.6 -Release: 13 +Release: 16 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 Source1: multipathd @@ -33,6 +33,7 @@ Patch1: multipath-tools-shark-update Patch2: multipath-tools-Makefile-cleanup.patch Patch3: multipath-tools-compile-fixes.patch +Patch4: multipath-tools-ibm-3526-update Patch10: multipath-tools-online-device.patch Patch11: multipath-tools-no-gz-for-manpage @@ -64,6 +65,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch11 -p1 %build @@ -118,6 +120,10 @@ %{_mandir}/man8/mpath_prio_alua.8* %changelog -n multipath-tools +* Wed Mar 29 2006 - hare(a)suse.de +- Explicitely create partitions at boot time (#159927) +* Thu Mar 23 2006 - hare(a)suse.de +- Add hwtable entry for IBM 3526. * Tue Mar 14 2006 - hare(a)suse.de - Fix another typo in mpath_id. * Tue Mar 14 2006 - hare(a)suse.de ++++++ boot.multipath ++++++ --- /work/SRC/all/multipath-tools/boot.multipath 2005-12-16 15:15:30.000000000 +0100 +++ /work/src/done/STABLE/multipath-tools/boot.multipath 2006-03-29 09:22:20.000000000 +0200 @@ -69,6 +69,9 @@ # Start the program directly as checkproc doesn't work here $PROGRAM -v 0 + # Create all partitions which might have been missing + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p -part" + # Remember status and be verbose rc_status -v sleep 1 ++++++ multipath-tools-ibm-3526-update ++++++ diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c index 008e518..3966fea 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -236,6 +236,22 @@ static struct hwentry default_hw[] = { .checker_name = TUR, }, { + /* IBM EXT300 ? */ + .vendor = "IBM", + .product = "3526", + .getuid = DEFAULT_GETUID, + .getprio = "/sbin/mpath_prio_tpc /dev/%n", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, + .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, + .no_path_retry = NO_PATH_RETRY_UNDEF, + .minio = DEFAULT_MINIO, + .checker_name = TUR, + }, + { /* IBM DS4200 / FAStT200 */ .vendor = "IBM", .product = "3542", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit lkcdutils
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package lkcdutils checked in at Wed Mar 29 11:58:07 CEST 2006. -------- --- /work/SRC/all/lkcdutils/lkcdutils.changes 2006-03-23 16:06:21.000000000 +0100 +++ /work/src/done/STABLE/lkcdutils/lkcdutils.changes 2006-03-29 09:05:43.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 09:04:47 CEST 2006 - hare(a)suse.de + +- Handle version 9 dumps correctly (#149136) +- Fix savedump to save kerntypes. + +------------------------------------------------------------------- New: ---- lkcdutils-handle-version-9.patch lkcdutils-save-kerntypes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lkcdutils.spec ++++++ --- /var/tmp/diff_new_pack.PrxMal/_old 2006-03-29 11:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.PrxMal/_new 2006-03-29 11:57:42.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: glib2-devel libelf popt-devel Summary: Linux Kernel Crash Dump (LKCD) Utilities Version: 7.0.1 -Release: 8 +Release: 10 License: GPL Group: System/Kernel # Original source is from Sourceforge CVS: @@ -37,6 +37,8 @@ Patch11: lkcdutils-dumputils-sysconfig.patch Patch12: lkcdutils-netdump-compile-fixes.patch Patch13: lkcdutils-fix-compat-dumps +Patch14: lkcdutils-save-kerntypes.patch +Patch15: lkcdutils-handle-version-9.patch Patch20: lkcdutils-ia64-fujitsu.patch Patch71: lkcdutils-netdump-secure_mode.patch Patch75: lkcdutils-netdump-doc.patch @@ -82,6 +84,8 @@ %patch11 %patch12 -p1 %patch13 +%patch14 -p3 +%patch15 -p3 cp %{S:4} PATCHES %build @@ -163,6 +167,9 @@ #/usr/sbin/netdump-login-client %changelog -n lkcdutils +* Wed Mar 29 2006 - hare(a)suse.de +- Handle version 9 dumps correctly (#149136) +- Fix savedump to save kerntypes. * Thu Mar 23 2006 - hare(a)suse.de - Fix S/390 standalone dumps (#159117 - LTC22496) * Thu Feb 23 2006 - hare(a)suse.de ++++++ lkcdutils-handle-version-9.patch ++++++ Support for version 9 dumps seems to have not made it forward into savedump. This adds it. Index: lkcd/7.X.X/lkcdutils/dumputils/savedump.h =================================================================== --- lkcd.orig/7.X.X/lkcdutils/dumputils/savedump.h 2006-03-27 06:06:10.842743983 -0800 +++ lkcd/7.X.X/lkcdutils/dumputils/savedump.h 2006-03-27 06:06:17.734824824 -0800 @@ -70,6 +70,9 @@ #define DUMP_LEVEL_HEADER 0x1 +#define KL_DUMP_PANIC_LEN 0x100 /* dump panic string length */ +#define KL_UTS_LEN 65 + typedef struct _dump_page_s { /* the address of this dump page */ @@ -116,7 +119,29 @@ /* the number of hardware/physical pages in this dump specifically */ uint32_t dh_num_dump_pages; -} generic_dump_header_t; + char panic_string[KL_DUMP_PANIC_LEN]; /* panic string, if available*/ + + /* timeval depends on machine, two long values */ + struct {uint64_t tv_sec; + uint64_t tv_usec; + } time; /* the time of the system crash */ + + /* the NEW utsname (uname) information -- in character form */ + /* we do this so we don't have to include utsname.h */ + /* plus it helps us be more architecture independent */ + char utsname_sysname[KL_UTS_LEN]; + char utsname_nodename[KL_UTS_LEN]; + char utsname_release[KL_UTS_LEN]; + char utsname_version[KL_UTS_LEN]; + char utsname_machine[KL_UTS_LEN]; + char utsname_domainname[KL_UTS_LEN]; + + uint64_t current_task; /* fixme: better use uint64_t here */ + uint32_t dump_compress; /* compression type used in this dump */ + uint32_t dump_flags; /* any additional flags */ + uint32_t dump_device; /* any additional flags */ + uint64_t dump_buffer_size; /* version >= 9 */ +} __attribute__((packed)) generic_dump_header_t; typedef struct generic_dump_header_asm_s { Index: lkcd/7.X.X/lkcdutils/dumputils/savedump.c =================================================================== --- lkcd.orig/7.X.X/lkcdutils/dumputils/savedump.c 2006-03-27 06:06:10.842743983 -0800 +++ lkcd/7.X.X/lkcdutils/dumputils/savedump.c 2006-03-27 06:06:17.734824824 -0800 @@ -814,6 +814,7 @@ dump_header_size = DUMP_HEADER_SIZE; +read_header: // Move beyond swap header // @@ -865,6 +866,17 @@ return 85; } + // Starting in version 9 dumps, the header size isn't a constant. + // We need to figure out what it is and make another pass to + // get the whole header. + + if (dh->dh_version >= 9 && dh->dump_buffer_size != dump_header_size) { + dump_header_size = dh->dump_buffer_size; + free(headerbuf); + + goto read_header; + } + // Find the asm_dump_header // ++++++ lkcdutils-save-kerntypes.patch ++++++ This makes savedump save a copy of Kerntypes in /var/log/dump like the old /sbin/lkcd script did. It also makes us save /boot/System.map-`uname -r` (which is also what /sbin/lkcd used to do) instead of /boot/System.map. Not all distros provide the symlink for us. Index: lkcd/7.X.X/lkcdutils/dumputils/savedump.c =================================================================== --- lkcd.orig/7.X.X/lkcdutils/dumputils/savedump.c 2006-01-11 11:19:24.000000000 -0800 +++ lkcd/7.X.X/lkcdutils/dumputils/savedump.c 2006-03-27 06:06:10.842743983 -0800 @@ -169,12 +169,20 @@ copy_map(struct confInfo *conf, int bounds) { char *smname; + char srcname[NAME_MAX]; FILE *dfd=NULL, *fp=NULL; + struct utsname utsbuf; char line[255], *fuser=NULL, *fpass=NULL; int err=0; disconnect(); + if (uname(&utsbuf) < 0) { + perror("uname"); + exit(EXIT_FAILURE); + } + sprintf(srcname, "/boot/System.map-%s", utsbuf.release); + if(conf->ftp){ if(conf->path == NULL){ @@ -221,14 +229,14 @@ return 39; } - if((fp = fopen("/boot/System.map", "r")) != NULL){ + if((fp = fopen(srcname, "r")) != NULL){ while (fgets(line,sizeof(line),fp) != NULL) { fprintf(dfd, "%s", line); } fflush(dfd); }else{ - fprintf(stderr, "Couldn't open /boot/System.map!\n"); + fprintf(stderr, "Couldn't open %s!\n", srcname); free(fuser); free(fpass); free(smname); @@ -276,14 +284,14 @@ return 81; } - if((fp = fopen("/boot/System.map", "r")) != NULL){ + if((fp = fopen(srcname, "r")) != NULL){ while (fgets(line,sizeof(line),fp) != NULL) { fprintf(dfd, "%s", line); } fflush(dfd); }else{ - fprintf(stderr, "Couldn't open /boot/System.map\n"); + fprintf(stderr, "Couldn't open %s\n", srcname); free(smname); disconnect(); return 82; @@ -302,6 +310,122 @@ } + +int +copy_kerntypes(struct confInfo *conf, int bounds) +{ + char srcname[NAME_MAX], dstname[NAME_MAX]; + struct utsname utsbuf; + FILE *dfd=NULL, *fp=NULL; + char *fuser, *fpass; + char buf[512]; + int n; + int err=0; + + disconnect(); + + if (uname(&utsbuf) < 0) { + perror("uname"); + exit(EXIT_FAILURE); + } + sprintf(srcname, "/boot/Kerntypes-%s", utsbuf.release); + +#ifdef DEBUG + printf("Kerntypes file name: %s\n", dstname); +#endif + + if(conf->ftp){ + if (conf->path) + sprintf(dstname, "%s/%d/kerntypes.%d", conf->path, bounds, bounds); + else + sprintf(dstname, "%d/kerntypes.%d", bounds, bounds); + + if ((fuser=(char *)malloc(strlen(conf->user)+7)) == NULL) { + perror("FATAL ERROR: Couldn't allocate enough memory"); + exit(10); + } + + if ((fpass=(char *)malloc(strlen(conf->pass)+7)) == NULL) { + perror("FATAL ERROR: Couldn't allocate enough memory"); + exit(10); + } + + sprintf(fuser, "USER %s", conf->user); + sprintf(fpass, "PASS %s", conf->pass); + + if ( ((err = FTPConnect(conf->host, fuser, fpass)) < 0) ){ + fprintf(stderr, "Could not connect to server!\n"); + free(fuser); + free(fpass); + exit(err); + } + + dfd = do_open(dstname); + if (!dfd) { + fprintf(stderr, "Could not create file!\n"); + free(fuser); + free(fpass); + disconnect(); + return 39; + } + + fopen(srcname, "r"); + if (!fp) { + fprintf(stderr, "Couldn't open %s!\n", srcname); + free(fuser); + free(fpass); + disconnect(); + return 82; + } + + while ((n = fread(buf, sizeof(buf), 1, fp))) + fwrite(buf, n, 1, fp); + +#ifdef DEBUG + printf("Wrote Kerntypes: %s\n", ktname); +#endif + + fflush(dfd); + fclose(fp); + free(fuser); + free(fpass); + disconnect(); + + return 0; + + } else { /* not ftp */ + if (conf->dir) + sprintf(dstname, "%s/%d/kerntypes.%d", conf->dir, bounds, bounds); + else + sprintf(dstname, "%d/kerntypes.%d", bounds, bounds); + + if ((dfd = fopen(dstname, "w")) == NULL) { + perror("Error opening destination kerntypes file"); + return 81; + } + + fp = fopen(srcname, "r"); + if (!fp) { + fprintf(stderr, "Couldn't open %s\n", srcname); + disconnect(); + return 82; + } + + while ((n = fread(buf, 1, sizeof(buf), fp))) + fwrite(buf, 1, n, dfd); + +#ifdef DEBUG + printf("Wrote kerntypes file: %s\n", dstname); +#endif + + fflush(dfd); + fclose(fp); + fclose(dfd); + return 0; + } +} + + // create a bounds file. // int @@ -1486,5 +1610,12 @@ printf("Successfully wrote System.map\n"); + if ( (i=copy_kerntypes(conf, bounds)) < 0) { + fprintf(stderr, "Error while copying Kerntypes\n"); + exit (i); + } + + printf("Successfully wrote Kerntypes\n"); + return 0; } //end main Index: lkcd/7.X.X/lkcdutils/dumputils/savedump.h =================================================================== --- lkcd.orig/7.X.X/lkcdutils/dumputils/savedump.h 2005-06-01 12:13:02.000000000 -0700 +++ lkcd/7.X.X/lkcdutils/dumputils/savedump.h 2006-03-27 06:06:10.842743983 -0800 @@ -37,6 +37,8 @@ #include <sys/types.h> #include <fcntl.h> #include <string.h> +#include <limits.h> +#include <sys/utsname.h> #define DUMP_BUFFER_SIZE (64 * 1024) #define DUMP_HEADER_SIZE DUMP_BUFFER_SIZE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rug
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package rug checked in at Wed Mar 29 10:21:03 CEST 2006. -------- --- /work/SRC/all/rug/rug.changes 2006-03-27 06:08:18.000000000 +0200 +++ /work/src/done/STABLE/rug/rug.changes 2006-03-29 04:01:30.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 04:00:53 CEST 2006 - maw(a)suse.de + +- New source drop (r26368) which: +- Adds a cache-clean command +- Prints the mono version when running the ping command + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.iqfUyT/_old 2006-03-29 10:20:48.000000000 +0200 +++ /var/tmp/diff_new_pack.iqfUyT/_new 2006-03-29 10:20:48.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.1 -Release: 18 +Release: 19 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -78,6 +78,10 @@ %_mandir/*/*/*.gz %changelog -n rug +* Wed Mar 29 2006 - maw(a)suse.de +- New source drop (r26368) which: +- Adds a cache-clean command +- Prints the mono version when running the ping command * Mon Mar 27 2006 - maw(a)suse.de - New source drop (r26225) which: - Fixes "rug db" to work without a catalog specified (#160564) ++++++ rug-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/ChangeLog new/rug-7.1.1/src/ChangeLog --- old/rug-7.1.1/src/ChangeLog 2006-03-27 04:27:00.000000000 +0200 +++ new/rug-7.1.1/src/ChangeLog 2006-03-29 02:29:10.000000000 +0200 @@ -1,3 +1,8 @@ +2006-03-28 James Willcox <james(a)ximian.com> + + * ServerCommands.cs: add 'cache-clean' command, and print the mono + version info in 'ping'. + 2006-03-26 Chris Rivera <cmr(a)ximian.com> * PackageCommands.cs: show the description for patterns and products too. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/ServerCommand.cs new/rug-7.1.1/src/ServerCommand.cs --- old/rug-7.1.1/src/ServerCommand.cs 2006-03-15 01:05:49.000000000 +0100 +++ new/rug-7.1.1/src/ServerCommand.cs 2006-03-29 02:29:10.000000000 +0200 @@ -57,7 +57,8 @@ Console.WriteLine (GetString ("RSS size: {0}"), info.RssSize); Console.WriteLine (GetString ("Network Connected: {0}"), info.IsNetworkConnected ? GetString ("Yes") : GetString ("No")); - + Console.WriteLine (GetString ("Running on {0}"), info.MonoVersion); + Console.WriteLine (""); Console.WriteLine (GetString ("OS Target: {0} {1} ({2})"), info.Target.ProductName, info.Target.Version, @@ -300,6 +301,31 @@ } } + class CacheCleanCmd: Command { + + public override string Name { + get { return "clean-cache"; } + } + + public override string[] Aliases { + get { return new string[] { "cc" }; } + } + + public override string Description { + get { return GetString ("Clean the HTTP cache"); } + } + + public override string Category { + get { return GetString ("System"); } + } + + public override void Execute () { + IDaemonHealth health = (IDaemonHealth) Activate ("IDaemonHealth", typeof (IDaemonHealth)); + health.CleanCache (); + Console.WriteLine (GetString ("Cache cleanup successful")); + } + } + /* class ScriptCmd: Command { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suse-release
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package suse-release checked in at Wed Mar 29 10:19:39 CEST 2006. -------- --- /work/SRC/all/suse-release/suse-release.changes 2006-03-13 19:24:19.000000000 +0100 +++ /work/src/done/STABLE/suse-release/suse-release.changes 2006-03-29 07:29:51.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 07:29:47 CEST 2006 - aj(a)suse.de + +- Beta9. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-release.spec ++++++ --- /var/tmp/diff_new_pack.pWga6w/_old 2006-03-29 10:19:20.000000000 +0200 +++ /var/tmp/diff_new_pack.pWga6w/_new 2006-03-29 10:19:20.000000000 +0200 @@ -14,7 +14,7 @@ License: GPL Group: System/Fhs Version: 10.1 -Release: 1 +Release: 4 Provides: aaa_version distribution-release suse-release-oss Provides: %{name}-%{version} Obsoletes: aaa_version suse-release-oss @@ -38,7 +38,7 @@ test -e /.buildenv && . /.buildenv echo -e "\nWelcome to $BUILD_DISTRIBUTION_NAME - Kernel \\\r (\\\l).\n\n" > $RPM_BUILD_ROOT/etc/issue echo "Welcome to $BUILD_DISTRIBUTION_NAME - Kernel %%r (%%t)." > $RPM_BUILD_ROOT/etc/issue.net -echo $BUILD_DISTRIBUTION_NAME "Beta8" > $RPM_BUILD_ROOT/etc/SuSE-release +echo $BUILD_DISTRIBUTION_NAME "Beta9" > $RPM_BUILD_ROOT/etc/SuSE-release echo VERSION = $BUILD_DISTRIBUTION_VERSION >> $RPM_BUILD_ROOT/etc/SuSE-release echo "Have a lot of fun..." > $RPM_BUILD_ROOT/etc/motd @@ -50,6 +50,8 @@ %config(noreplace) /etc/issue.net %changelog -n suse-release +* Wed Mar 29 2006 - aj(a)suse.de +- Beta9. * Mon Mar 13 2006 - lrupp(a)suse.de - New Version: 10.1 (needed for content file) * Fri Mar 10 2006 - aj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package zmd checked in at Wed Mar 29 10:19:11 CEST 2006. -------- --- /work/SRC/all/zmd/zmd.changes 2006-03-27 05:47:51.000000000 +0200 +++ /work/src/done/STABLE/zmd/zmd.changes 2006-03-29 03:48:47.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 29 03:47:41 CEST 2006 - maw(a)suse.de + +- New source drop (r26368) which: +- Makes sure there is sufficient disk space before downloading + packages +- Cleans the cache after each transaction +- Logs the mono version on startup +- Adds the preference cache-max-size-hard-limit +- Doesn't expire cache when coming out of sleep mode + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.m8NLy1/_old 2006-03-29 10:18:21.000000000 +0200 +++ /var/tmp/diff_new_pack.m8NLy1/_new 2006-03-29 10:18:21.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: 31 +Release: 32 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-7.1.1.tar.bz2 @@ -153,6 +153,14 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Wed Mar 29 2006 - maw(a)suse.de +- New source drop (r26368) which: +- Makes sure there is sufficient disk space before downloading + packages +- Cleans the cache after each transaction +- Logs the mono version on startup +- Adds the preference cache-max-size-hard-limit +- Doesn't expire cache when coming out of sleep mode * Mon Mar 27 2006 - maw(a)suse.de - New source drop (r26223) which: - Adds summary and description fields for patches, patterns, ++++++ zmd-7.1.1.tar.bz2 ++++++ ++++ 1603 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog --- old/zmd-7.1.1/modules/ChangeLog 2006-03-27 04:24:20.000000000 +0200 +++ new/zmd-7.1.1/modules/ChangeLog 2006-03-29 02:26:06.000000000 +0200 @@ -1,3 +1,19 @@ +2006-03-28 James Willcox <james(a)ximian.com> + + * linux/Transaction.cs: check to make sure we have enough disk + space and things before downloading packages. + +2006-03-28 Tambet Ingo <tambet(a)ximian.com> + + * linux/red-carpet-backend/rc-world-sql.c (rc_world_sql_load_channels): + Replace 'priority_unsubd' field in catalogs table to 'subscribed'. + Fixes #151191. + + * linux/Database.cs: Ditto. + + * linux/YumService.cs: Rewrite metadata parsing. Shortcut refresh when + metadata hasn't changed. + 2006-03-26 Chris Rivera <cmr(a)ximian.com> * linux/Patch.cs: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Database.cs new/zmd-7.1.1/modules/linux/Database.cs --- old/zmd-7.1.1/modules/linux/Database.cs 2006-03-23 23:51:12.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/Database.cs 2006-03-28 21:12:12.000000000 +0200 @@ -97,7 +97,7 @@ " alias VARCHAR," + " description VARCHAR," + " priority INTEGER," + - " priority_unsubd INTEGER)"; + " subscribed INTEGER)"; ExecNonQuery (sql); // Resolvables @@ -392,29 +392,29 @@ private IDataParameter alias; private IDataParameter description; private IDataParameter priority; - private IDataParameter priorityUnsubd; + private IDataParameter subscribed; public CatalogWriter () { string sql = - "INSERT INTO catalogs (id, name, alias, description, priority, priority_unsubd) " + + "INSERT INTO catalogs (id, name, alias, description, priority, subscribed) " + "VALUES (?, ?, ?, ?, ?, ?)"; command = (SqliteCommand) Connection.CreateCommand (); command.CommandText = sql; - id = new SqliteParameter ("id", DbType.String); - name = new SqliteParameter ("name", DbType.String); - alias = new SqliteParameter ("alias", DbType.String); - description = new SqliteParameter ("description", DbType.String); - priority = new SqliteParameter ("priority", DbType.Int32); - priorityUnsubd = new SqliteParameter ("priority_unsubd", DbType.Int32); + id = new SqliteParameter ("id", DbType.String); + name = new SqliteParameter ("name", DbType.String); + alias = new SqliteParameter ("alias", DbType.String); + description = new SqliteParameter ("description", DbType.String); + priority = new SqliteParameter ("priority", DbType.Int32); + subscribed = new SqliteParameter ("subscribed", DbType.Int32); command.Parameters.Add (id); command.Parameters.Add (name); command.Parameters.Add (alias); command.Parameters.Add (description); command.Parameters.Add (priority); - command.Parameters.Add (priorityUnsubd); + command.Parameters.Add (subscribed); command.Prepare (); } @@ -434,7 +434,7 @@ alias.Value = Database.SqlString (catalog.DisplayName); description.Value = ""; priority.Value = catalog.Priority; - priorityUnsubd.Value = catalog.Priority; + subscribed.Value = Convert.ToInt32 (catalog.IsSubscribed); GetLock (false); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Transaction.cs new/zmd-7.1.1/modules/linux/Transaction.cs --- old/zmd-7.1.1/modules/linux/Transaction.cs 2006-03-11 05:29:49.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/Transaction.cs 2006-03-29 02:26:06.000000000 +0200 @@ -118,38 +118,89 @@ this.flags = flags; } - public void Start () { - if (installs != null) { - foreach (IResolvable r in installs) { - // FIXME: Download other types of resolvables - if (r is Package) { - Package pkg = (Package) r; + private Package[] GetPackagesToDownload () { + ArrayList list = new ArrayList (); - if (pkg.FileName == null) { - Progress progress = pkg.Fetch (); - if (progress == null) - throw new ZenException (GettextCatalog.GetString ("Can not download package {0}."), pkg); - downloadProgress.Add (progress); - } - } + if (installs != null) { + foreach (Package pkg in installs) { + if (pkg.FileName == null) + list.Add (pkg); } } if (upgrades != null) { - foreach (IResolvable r in upgrades) { - // FIXME: Download other types of resolvables - if (r is Package) { - Package pkg = (Package) r; - if (pkg.FileName == null) { - Progress progress = pkg.Fetch (); - if (progress == null) - throw new ZenException (GettextCatalog.GetString ("Can not download package {0}."), pkg); - downloadProgress.Add (progress); - } - } + foreach (Package pkg in upgrades) { + if (pkg.FileName == null) + list.Add (pkg); + } + } + + return (Package[]) list.ToArray (typeof (Package)); + } + + private bool CheckDownloadSpace () { + long required = 0; + + foreach (Package p in GetPackagesToDownload ()) { + required += p.FileSize; + } + + if (required == 0) + return true; + + string cacheDir = PreferenceManager.GetString ("cache-directory"); + + int mostMatched = 0; + UnixDriveInfo drive = null; + + foreach (UnixDriveInfo d in UnixDriveInfo.GetDrives ()) { + if (cacheDir.StartsWith (d.Name) && d.Name.Length > mostMatched) { + mostMatched = d.Name.Length; + drive = d; + } + } + + // ummm.... + if (drive == null) + return true; + + if (required > drive.AvailableFreeSpace) { + downloadProgress.Fail (String.Format ("Insufficient disk space. {0} more bytes are needed.", + required - drive.AvailableFreeSpace)); + return false; + } + + if (PreferenceManager.GetBoolean ("cache-max-size-hard-limit")) { + int max = PreferenceManager.GetInteger ("cache-max-size-in-mb") * 1024 * 1024; + long cacheSize = WebCache.GetSize (); + + if ((required + cacheSize > max) && PreferenceManager.GetBoolean ("cache-cleanup-enabled")) { + WebCache.Expire (); + cacheSize = WebCache.GetSize (); + } + + if (required + cacheSize > max) { + downloadProgress.Fail (String.Format ("Insufficient cache size. Current limit is {0}, need {1} more bytes", + PreferenceManager.GetInteger ("cache-max-size-in-mb"), + required + cacheSize - max)); + return false; } } + return true; + } + + public void Start () { + if (!CheckDownloadSpace ()) + return; + + foreach (Package pkg in GetPackagesToDownload ()) { + Progress progress = pkg.Fetch (); + if (progress == null) + throw new ZenException (GettextCatalog.GetString ("Can not download package {0}."), pkg); + downloadProgress.Add (progress); + } + downloadProgress.Start (); } @@ -179,6 +230,11 @@ } CommitLogEntries (); + + if (PreferenceManager.GetBoolean ("cache-cleanup-enabled")) { + WebCache.Expire (); + } + log.Info ("Package transaction finished"); } else log.Error ("Package transaction failed: " + transactionProgress.GetError ()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/YumService.cs new/zmd-7.1.1/modules/linux/YumService.cs --- old/zmd-7.1.1/modules/linux/YumService.cs 2006-03-24 23:00:52.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/YumService.cs 2006-03-28 21:12:12.000000000 +0200 @@ -23,7 +23,8 @@ using System.IO; using System.Collections; using System.Threading; -using System.Xml; +using System.Xml.Serialization; +using Mono.Unix.Native; using Novell.Zenworks.Zmd.Public; using Novell.Zenworks.Zmd; using Novell.Zenworks.Utility; @@ -36,6 +37,7 @@ private Catalog catalog; private PackageCollection packages; private MultiProgress refreshProgress; + private Repomd currentRepomd = Repomd.Empty; private static string repomdFileName = "repodata/repomd.xml"; @@ -76,7 +78,6 @@ } public override Progress Refresh () { - Remove (); return Refresh (false); } @@ -100,6 +101,8 @@ } private void Remove () { + currentRepomd = Repomd.Empty; + if (packages != null) { PackageManager.RemoveAvailablePackages (packages); packages = null; @@ -138,11 +141,18 @@ private void DoRefresh () { try { - ParseRepomd (); + Repomd md = ParseRepomd (); + + if (md.Equals (currentRepomd)) { + refreshProgress.Finish (); + return; + } + + Remove (); - packages = YumPackage.FromDatabase (catalog); - PackageManager.AddAvailablePackages (packages); - BundleManager.Add (catalog); + DownloadRepoFiles (md); + ParseMetadata (md); + currentRepomd = md; refreshProgress.Finish (); } catch (Exception e) { @@ -154,98 +164,218 @@ } } - private void ParseRepomd () { + private void ParseMetadata (Repomd md) { + // FIXME: Add a progress for it + Backend.Current.ParseMetadata ("yum", md.Prefix, catalog); + + packages = YumPackage.FromDatabase (catalog); + PackageManager.AddAvailablePackages (packages); + BundleManager.Add (catalog); + + // FIXME: Add a progress for it + RedCarpetBackend.UpdatePatchStatus (); + } + + private void DownloadRepoFiles (Repomd md) { + MultiProgress repofileProgress = refreshProgress["repofiles"] as MultiProgress; + MultiProgress patchesProgress = refreshProgress["patches"] as MultiProgress; + + RepomdEntry patchEntry = md[RepomdEntryType.Patches]; + if (!patchEntry.Equals (RepomdEntry.Empty)) { + // Download and parse patches.xml + string path = cache.Download (WebCache.GetMergedUri (Uri, patchEntry.Location.Url)); + PatchCollection patches = PatchCollection.FromXml (path); + + // Add list of patch.xml files to download + foreach (Patch p in patches.Patches) { + DownloadProgress dp = new DownloadProgress (WebCache.GetMergedUri (Uri, p.Location.Url)); + patchesProgress.Add (dp); + } + } + + foreach (RepomdEntry entry in md.Entries) { + if (entry.Type == RepomdEntryType.Patches) + continue; + + DownloadProgress dp = new DownloadProgress (WebCache.GetMergedUri (Uri, entry.Location.Url)); + repofileProgress.Add (dp); + } + + // Download repo files + foreach (DownloadProgress dp in repofileProgress.Children) { + cache.Download (dp); + } + + // Download patch files + bool initialCacheState = WebCache.ForceCache; + WebCache.ForceCache = true; + + foreach (DownloadProgress dp in patchesProgress.Children) + cache.Download (dp); + + WebCache.ForceCache = initialCacheState; + } + + private Repomd ParseRepomd () { string path = cache.Download (refreshProgress["repomd"] as DownloadProgress); + return Repomd.FromXml (path); + } - using (Stream stream = File.OpenRead (path)) { - XmlTextReader reader = new XmlTextReader (stream); + // Helper classes for XML parsing - MultiProgress repofileProgress = refreshProgress["repofiles"] as MultiProgress; - MultiProgress patchesProgress = refreshProgress["patches"] as MultiProgress; + [XmlRoot ("repomd", Namespace = "http://linux.duke.edu/metadata/repo")] + public struct Repomd { + [XmlElement ("data")] + public RepomdEntry[] Entries; - bool havePatches = false; + [XmlIgnore ()] + public string Prefix; - while (reader.Read ()) { - if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "data") { - string type = reader["type"]; - string entry = ParseRepomdEntry (reader); - - if (entry == null) - Console.WriteLine ("Could not find the location tag, ignoring"); - else { - DownloadProgress dp = new DownloadProgress (entry); - dp.SetData ("type", type); - repofileProgress.Add (dp); - - if (type == "patches") - havePatches = true; - } + [XmlIgnore ()] + public static Repomd Empty = new Repomd (); + + public RepomdEntry this[RepomdEntryType type] { + get { + foreach (RepomdEntry e in Entries) { + if (e.Type == type) + return e; } - } - foreach (DownloadProgress dp in repofileProgress.Children) { - string type = dp.GetData ("type") as string; - string filename = cache.Download (dp); + return RepomdEntry.Empty; + } + } - if (havePatches && type == "patches") - ParsePatches (patchesProgress, filename); + public override bool Equals (object o) { + if (!(o is Repomd)) + return false; + + Repomd other = (Repomd) o; + + if (Entries != null) { + if (other.Entries == null || Entries.Length != other.Entries.Length) + return false; + } else if (other.Entries == null) + return false; + + foreach (RepomdEntry otherEntry in other.Entries) { + RepomdEntry entry = this[otherEntry.Type]; + if (!entry.Equals (otherEntry)) + return false; } - if (havePatches) - DownloadPatches (patchesProgress); + return true; } - // Remove the trailing "repodata/repomd.xml" - path = path.Substring (0, path.Length - repomdFileName.Length); + public static Repomd FromXml (string filename) { + Repomd md; + + using (FileStream fs = new FileStream (filename, FileMode.Open)) { + XmlSerializer serializer = new XmlSerializer (typeof (Repomd)); + md = (Repomd) serializer.Deserialize (fs); + } - Backend.Current.ParseMetadata ("yum", path, catalog); + // Remove the trailing "repodata/repomd.xml" + md.Prefix = filename.Substring (0, filename.Length - repomdFileName.Length); ; + + return md; + } } - private string ParseRepomdEntry (XmlTextReader reader) { - string path = null; + public struct RepomdEntry { + [XmlAttribute ("type")] + public RepomdEntryType Type; + + [XmlElement ("location")] + public Location Location; + + [XmlElement ("checksum")] + public Checksum Checksum; + + [XmlElement ("open-checksum")] + public Checksum OpenChecksum; - while (reader.Read ()) { - if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "location") { - path = WebCache.GetMergedUri (Uri, reader["href"]); - break; - } else if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "data") - break; + // This has to be public, otherwise serialization can not set it. + [XmlElement ("timestamp")] + public long timestamp; + + [XmlIgnore ()] + public DateTime Timestamp { + get { return NativeConvert.ToDateTime (timestamp); } } - return path; + [XmlIgnore ()] + public static RepomdEntry Empty = new RepomdEntry (); } - private void ParsePatches (MultiProgress patchesProgress, string filename) { - using (Stream stream = Novell.Zenworks.Zmd.Util.OpenMaybeCompressedFile (filename, FileMode.Open)) { - XmlTextReader reader = new XmlTextReader (stream); + public enum RepomdEntryType { + [XmlEnum (Name = "primary")] + Primary, - while (reader.Read ()) { - if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "patch") { - ReadPatch (patchesProgress, reader); - } - } - } + [XmlEnum (Name = "other")] + Other, + + [XmlEnum (Name = "filelists")] + FileLists, + + [XmlEnum (Name = "group")] + Group, + + // SuSE specific extensions + + [XmlEnum (Name = "product")] + Product, + + [XmlEnum (Name = "pattern")] + Pattern, + + [XmlEnum (Name = "patches")] + Patches } - private void DownloadPatches (MultiProgress patchesProgress) { - bool initialCacheState = WebCache.ForceCache; - WebCache.ForceCache = true; + public struct Checksum { + [XmlAttribute ("type")] + public string Type; - foreach (DownloadProgress dp in patchesProgress.Children) - cache.Download (dp); + [XmlText ()] + public string Value; + } - WebCache.ForceCache = initialCacheState; - RedCarpetBackend.UpdatePatchStatus (); + public struct Location { + [XmlAttribute ("href")] + public string Url; + + public override string ToString () { + return Url; + } } - private void ReadPatch (MultiProgress patchesProgress, XmlTextReader reader) { - while (reader.Read ()) { - if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "location") { - patchesProgress.Add (new DownloadProgress (WebCache.GetMergedUri (Uri, reader["href"]))); - } else if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "patch") - return; + [XmlRoot ("patches", Namespace = "http://novell.com/package/metadata/suse/patches")] + public struct PatchCollection { + [XmlElement ("patch")] + public Patch[] Patches; + + public static PatchCollection FromXml (string filename) { + PatchCollection patches; + + using (FileStream fs = new FileStream (filename, FileMode.Open)) { + XmlSerializer serializer = new XmlSerializer (typeof (PatchCollection)); + patches = (PatchCollection) serializer.Deserialize (fs); + } + + return patches; } } + + public struct Patch { + [XmlAttribute ("id")] + public string Id; + + [XmlElement ("checksum")] + public Checksum Checksum; + + [XmlElement ("location")] + public Location Location; + } } public class YumPackage : SqlPackage { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/red-carpet-backend/README new/zmd-7.1.1/modules/linux/red-carpet-backend/README --- old/zmd-7.1.1/modules/linux/red-carpet-backend/README 2006-03-22 17:08:43.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/red-carpet-backend/README 2006-03-28 21:12:12.000000000 +0200 @@ -150,8 +150,9 @@ alias VARCHAR description VARCHAR priority INTEGER - priority_unsubd INTEGER + subscribed INTEGER +subscribed == 0 means not subscribed, anything else is subscribed. dependencies diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c new/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c --- old/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c 2006-03-11 05:29:49.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c 2006-03-28 21:12:12.000000000 +0200 @@ -222,7 +222,7 @@ gboolean success = FALSE; query = - "SELECT id, name, alias, description, priority, priority_unsubd " + "SELECT id, name, alias, description, priority, subscribed " "FROM catalogs"; rc = sqlite3_prepare (db, query, -1, &handle, NULL); @@ -238,9 +238,10 @@ (const char *) sqlite3_column_text (handle, 1), (const char *) sqlite3_column_text (handle, 2), (const char *) sqlite3_column_text (handle, 3)); - rc_channel_set_priorities (ch, - sqlite3_column_int (handle, 4), - sqlite3_column_int (handle, 5)); + rc_channel_set_priorities (ch, sqlite3_column_int (handle, 4), 0); + + if (sqlite3_column_int (handle, 5)) + rc_channel_set_subscription (ch, TRUE); if (!strcmp (rc_channel_get_id (ch), "@system")) { rc_channel_set_system (ch); Binary files old/zmd-7.1.1/po/de_DE.gmo and new/zmd-7.1.1/po/de_DE.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/de_DE.po new/zmd-7.1.1/po/de_DE.po --- old/zmd-7.1.1/po/de_DE.po 2006-03-27 03:31:06.000000000 +0200 +++ new/zmd-7.1.1/po/de_DE.po 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-26 20:31-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 <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -147,7 +147,7 @@ msgid "Resolvable {0} is already installed." msgstr "Bundle '{0}' ist bereits installiert." -#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146 +#: modules/linux/Transaction.cs:200 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -421,12 +421,7 @@ msgid "A daemon is already running" msgstr "Es wird bereits ein Daemon ausgeführt." -#. Expire old cached files -#: src/Daemon.cs:281 -msgid "Expiring cached files..." -msgstr "Ablauf der Dateien im Cache..." - -#: src/Daemon.cs:305 +#: src/Daemon.cs:307 msgid "Loading trusted certificates..." msgstr "Vertrauenswürdige Zertifikate werden geladen..." @@ -546,8 +541,8 @@ msgstr "IP-Adresse für die Bindung (leer bedeutet \"alle\")" #: src/Prefs.cs:315 -msgid "Cache downloaded packages and metadata" -msgstr "Heruntergeladene Pakete und Metadaten im Cache ablegen" +msgid "The directory to store cached packages and metadata" +msgstr "Verzeichnis zum Speichern von Paketen und Metadaten aus dem Cache" #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400 @@ -555,33 +550,33 @@ msgstr "Cache" #: src/Prefs.cs:327 -msgid "The directory to store cached packages and metadata" -msgstr "Verzeichnis zum Speichern von Paketen und Metadaten aus dem Cache" - -#: src/Prefs.cs:339 msgid "The maximum number of days to cache a file" msgstr "Max. Anzahl der Tage zur Aufbewahrung einer Datei im Cache" -#: src/Prefs.cs:351 +#: src/Prefs.cs:339 msgid "The maximum number of simultaneous downloads" msgstr "Max. Anzahl der gleichzeitigen Downloads" -#: src/Prefs.cs:363 +#: src/Prefs.cs:351 msgid "The maximum number of download retries" msgstr "Max. Anzahl der Download-Neuversuche" -#: src/Prefs.cs:375 +#: src/Prefs.cs:363 msgid "The number of milliseconds to delay before retrying a download" msgstr "Wartezeit vor Download-Neuversuch (in Millisekunden)" -#: src/Prefs.cs:387 +#: src/Prefs.cs:375 msgid "Automatically clean up the cache" msgstr "Cache automatisch leeren" -#: src/Prefs.cs:399 +#: src/Prefs.cs:387 msgid "The maximum size of the cache (in mb)" msgstr "Max. Größe des Cache (in MB)" +#: src/Prefs.cs:399 +msgid "If true, never allow the cache to grow past the maximum size" +msgstr "" + #: src/Prefs.cs:411 msgid "Whether or not verified SSL certificates are required" msgstr "Ob bestätigte SSL-Zeritifikate erforderlich sind oder nicht" @@ -748,22 +743,26 @@ msgid "System" msgstr "System" -#: src/WebCache.cs:416 src/WebCache.cs:419 +#: src/WebCache.cs:332 +msgid "Expiring cached files..." +msgstr "Ablauf der Dateien im Cache..." + +#: src/WebCache.cs:423 src/WebCache.cs:426 #, csharp-format msgid "Download failed: ({0}) {1}" msgstr "Fehler beim Herunterladen: ({0}) {1}" -#: src/WebCache.cs:473 +#: src/WebCache.cs:480 #, csharp-format msgid "File not found: {0}" msgstr "Datei nicht gefunden: {0}" -#: src/WebCache.cs:502 +#: src/WebCache.cs:509 #, csharp-format msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:886 +#: src/WebCache.cs:893 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Unbekannte Cache-Speicherversion '{0}'" @@ -832,6 +831,9 @@ msgid "No registration URL is available" msgstr "Keine Registrierungs-URL verfügbar" +#~ msgid "Cache downloaded packages and metadata" +#~ msgstr "Heruntergeladene Pakete und Metadaten im Cache ablegen" + #~ msgid "The system catalog" #~ msgstr "Der Systemkatalog" Binary files old/zmd-7.1.1/po/en_US.gmo and new/zmd-7.1.1/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/en_US.po new/zmd-7.1.1/po/en_US.po --- old/zmd-7.1.1/po/en_US.po 2006-03-27 03:31:06.000000000 +0200 +++ new/zmd-7.1.1/po/en_US.po 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-26 20:31-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 <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -144,7 +144,7 @@ msgid "Resolvable {0} is already installed." msgstr "Bundle '{0}' is already installed." -#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146 +#: modules/linux/Transaction.cs:200 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -415,12 +415,7 @@ msgid "A daemon is already running" msgstr "A daemon is already running" -#. Expire old cached files -#: src/Daemon.cs:281 -msgid "Expiring cached files..." -msgstr "Expiring cached files..." - -#: src/Daemon.cs:305 +#: src/Daemon.cs:307 msgid "Loading trusted certificates..." msgstr "Loading trusted certificates..." @@ -539,8 +534,8 @@ msgstr "IP address to bind to (empty means \"all\")" #: src/Prefs.cs:315 -msgid "Cache downloaded packages and metadata" -msgstr "Cache downloaded packages and metadata" +msgid "The directory to store cached packages and metadata" +msgstr "The directory to store cached packages and metadata" #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400 @@ -548,33 +543,33 @@ msgstr "Cache" #: src/Prefs.cs:327 -msgid "The directory to store cached packages and metadata" -msgstr "The directory to store cached packages and metadata" - -#: src/Prefs.cs:339 msgid "The maximum number of days to cache a file" msgstr "The maximum number of days to cache a file" -#: src/Prefs.cs:351 +#: src/Prefs.cs:339 msgid "The maximum number of simultaneous downloads" msgstr "The maximum number of simultaneous downloads" -#: src/Prefs.cs:363 +#: src/Prefs.cs:351 msgid "The maximum number of download retries" msgstr "The maximum number of download retries" -#: src/Prefs.cs:375 +#: src/Prefs.cs:363 msgid "The number of milliseconds to delay before retrying a download" msgstr "The number of milliseconds to delay before retrying a download" -#: src/Prefs.cs:387 +#: src/Prefs.cs:375 msgid "Automatically clean up the cache" msgstr "Automatically clean up the cache" -#: src/Prefs.cs:399 +#: src/Prefs.cs:387 msgid "The maximum size of the cache (in mb)" msgstr "The maximum size of the cache (in mb)" +#: src/Prefs.cs:399 +msgid "If true, never allow the cache to grow past the maximum size" +msgstr "" + #: src/Prefs.cs:411 msgid "Whether or not verified SSL certificates are required" msgstr "Whether or not verified SSL certificates are required" @@ -737,22 +732,26 @@ msgid "System" msgstr "system" -#: src/WebCache.cs:416 src/WebCache.cs:419 +#: src/WebCache.cs:332 +msgid "Expiring cached files..." +msgstr "Expiring cached files..." + +#: src/WebCache.cs:423 src/WebCache.cs:426 #, csharp-format msgid "Download failed: ({0}) {1}" msgstr "Download failed: ({0}) {1}" -#: src/WebCache.cs:473 +#: src/WebCache.cs:480 #, csharp-format msgid "File not found: {0}" msgstr "File not found: {0}" -#: src/WebCache.cs:502 +#: src/WebCache.cs:509 #, csharp-format msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:886 +#: src/WebCache.cs:893 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Unknown cache storage version '{0}'" @@ -821,6 +820,9 @@ msgid "No registration URL is available" msgstr "No registration URL is available" +#~ msgid "Cache downloaded packages and metadata" +#~ msgstr "Cache downloaded packages and metadata" + #~ msgid "The system catalog" #~ msgstr "The system catalog" Binary files old/zmd-7.1.1/po/es_ES.gmo and new/zmd-7.1.1/po/es_ES.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/es_ES.po new/zmd-7.1.1/po/es_ES.po --- old/zmd-7.1.1/po/es_ES.po 2006-03-27 03:31:06.000000000 +0200 +++ new/zmd-7.1.1/po/es_ES.po 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-26 20:31-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 <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -150,7 +150,7 @@ msgid "Resolvable {0} is already installed." msgstr "El lote '{0}' ya está instalado." -#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146 +#: modules/linux/Transaction.cs:200 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -423,12 +423,7 @@ msgid "A daemon is already running" msgstr "Ya hay un daemon ejecutándose" -#. Expire old cached files -#: src/Daemon.cs:281 -msgid "Expiring cached files..." -msgstr "Comprobando caducidad de archivos del caché..." - -#: src/Daemon.cs:305 +#: src/Daemon.cs:307 msgid "Loading trusted certificates..." msgstr "Cargando certificados de confianza..." @@ -548,8 +543,9 @@ msgstr "Dirección IP a la que asociarse (vacío implica \"todos\")" #: src/Prefs.cs:315 -msgid "Cache downloaded packages and metadata" -msgstr "Paquetes y metadatos descargados en caché" +msgid "The directory to store cached packages and metadata" +msgstr "" +"El directorio en el que almacenar paquetes y metadatos almacenados en caché" #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400 @@ -557,34 +553,33 @@ msgstr "Caché" #: src/Prefs.cs:327 -msgid "The directory to store cached packages and metadata" -msgstr "" -"El directorio en el que almacenar paquetes y metadatos almacenados en caché" - -#: src/Prefs.cs:339 msgid "The maximum number of days to cache a file" msgstr "Número máximo de días en los que guardar un archivo en caché" -#: src/Prefs.cs:351 +#: src/Prefs.cs:339 msgid "The maximum number of simultaneous downloads" msgstr "Número máximo de descargas simultáneas" -#: src/Prefs.cs:363 +#: src/Prefs.cs:351 msgid "The maximum number of download retries" msgstr "Número máximo de reintentos de descarga" -#: src/Prefs.cs:375 +#: src/Prefs.cs:363 msgid "The number of milliseconds to delay before retrying a download" msgstr "Número de milisegundos de retraso antes de reintentar descargar" -#: src/Prefs.cs:387 +#: src/Prefs.cs:375 msgid "Automatically clean up the cache" msgstr "Limpiar automáticamente el caché" -#: src/Prefs.cs:399 +#: src/Prefs.cs:387 msgid "The maximum size of the cache (in mb)" msgstr "Tamaño máximo del caché (en MB)" +#: src/Prefs.cs:399 +msgid "If true, never allow the cache to grow past the maximum size" +msgstr "" + #: src/Prefs.cs:411 msgid "Whether or not verified SSL certificates are required" msgstr "Si es necesario disponer de certificados SSL validados o no" @@ -750,22 +745,26 @@ msgid "System" msgstr "sistema" -#: src/WebCache.cs:416 src/WebCache.cs:419 +#: src/WebCache.cs:332 +msgid "Expiring cached files..." +msgstr "Comprobando caducidad de archivos del caché..." + +#: src/WebCache.cs:423 src/WebCache.cs:426 #, csharp-format msgid "Download failed: ({0}) {1}" msgstr "Error de descarga: ({0}) {1}" -#: src/WebCache.cs:473 +#: src/WebCache.cs:480 #, csharp-format msgid "File not found: {0}" msgstr "Archivo no encontrado: {0}" -#: src/WebCache.cs:502 +#: src/WebCache.cs:509 #, csharp-format msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:886 +#: src/WebCache.cs:893 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Versión de almacenamiento en caché '{0}' desconocida" @@ -834,6 +833,9 @@ msgid "No registration URL is available" msgstr "No hay ninguna URL de registro disponible" +#~ msgid "Cache downloaded packages and metadata" +#~ msgstr "Paquetes y metadatos descargados en caché" + #~ msgid "The system catalog" #~ msgstr "El catálogo del sistema" Binary files old/zmd-7.1.1/po/fr_FR.gmo and new/zmd-7.1.1/po/fr_FR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/fr_FR.po new/zmd-7.1.1/po/fr_FR.po --- old/zmd-7.1.1/po/fr_FR.po 2006-03-27 03:31:06.000000000 +0200 +++ new/zmd-7.1.1/po/fr_FR.po 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-26 20:31-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 <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -149,7 +149,7 @@ msgid "Resolvable {0} is already installed." msgstr "L'ensemble '{0}' est déjà installé." -#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146 +#: modules/linux/Transaction.cs:200 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -425,12 +425,7 @@ msgid "A daemon is already running" msgstr "Un daemon est déjà en cours d'exécution" -#. Expire old cached files -#: src/Daemon.cs:281 -msgid "Expiring cached files..." -msgstr "Expiration des fichiers cache..." - -#: src/Daemon.cs:305 +#: src/Daemon.cs:307 msgid "Loading trusted certificates..." msgstr "Chargement des certificats autorisés..." @@ -550,8 +545,8 @@ msgstr "Adresse IP à lier à (vide signifie \"tous\")" #: src/Prefs.cs:315 -msgid "Cache downloaded packages and metadata" -msgstr "Paquetages et métadonnées téléchargés dans le cache" +msgid "The directory to store cached packages and metadata" +msgstr "Répertoire de stockage des paquetages et des métadonnées mis en cache" #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400 @@ -559,33 +554,33 @@ msgstr "Cache" #: src/Prefs.cs:327 -msgid "The directory to store cached packages and metadata" -msgstr "Répertoire de stockage des paquetages et des métadonnées mis en cache" - -#: src/Prefs.cs:339 msgid "The maximum number of days to cache a file" msgstr "Nombre maximum de jour de mise en cache d'un fichier" -#: src/Prefs.cs:351 +#: src/Prefs.cs:339 msgid "The maximum number of simultaneous downloads" msgstr "Nombre maximum de téléchargements simultanés" -#: src/Prefs.cs:363 +#: src/Prefs.cs:351 msgid "The maximum number of download retries" msgstr "Nombre maximum de nouvelles tentatives de téléchargement" -#: src/Prefs.cs:375 +#: src/Prefs.cs:363 msgid "The number of milliseconds to delay before retrying a download" msgstr "Nombre de millisecondes avant une nouvelle tentative de téléchargement" -#: src/Prefs.cs:387 +#: src/Prefs.cs:375 msgid "Automatically clean up the cache" msgstr "Nettoyer automatiquement le cache" -#: src/Prefs.cs:399 +#: src/Prefs.cs:387 msgid "The maximum size of the cache (in mb)" msgstr "La taille maximale du cache (en Mo)" +#: src/Prefs.cs:399 +msgid "If true, never allow the cache to grow past the maximum size" +msgstr "" + #: src/Prefs.cs:411 msgid "Whether or not verified SSL certificates are required" msgstr "Si les certificats SSL sont requis ou non" @@ -749,22 +744,26 @@ msgid "System" msgstr "Système" -#: src/WebCache.cs:416 src/WebCache.cs:419 +#: src/WebCache.cs:332 +msgid "Expiring cached files..." +msgstr "Expiration des fichiers cache..." + +#: src/WebCache.cs:423 src/WebCache.cs:426 #, csharp-format msgid "Download failed: ({0}) {1}" msgstr "Échec du téléchargement :({0}) {1}" -#: src/WebCache.cs:473 +#: src/WebCache.cs:480 #, csharp-format msgid "File not found: {0}" msgstr "Fichier introuvable {0}" -#: src/WebCache.cs:502 +#: src/WebCache.cs:509 #, csharp-format msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:886 +#: src/WebCache.cs:893 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Version de stockage de cache '{0}' inconnue" @@ -833,6 +832,9 @@ msgid "No registration URL is available" msgstr "Aucune URL d'enregistrement n'est disponible" +#~ msgid "Cache downloaded packages and metadata" +#~ msgstr "Paquetages et métadonnées téléchargés dans le cache" + #~ msgid "The system catalog" #~ msgstr "Le catalogue système" Binary files old/zmd-7.1.1/po/pt_BR.gmo and new/zmd-7.1.1/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/pt_BR.po new/zmd-7.1.1/po/pt_BR.po --- old/zmd-7.1.1/po/pt_BR.po 2006-03-27 03:31:06.000000000 +0200 +++ new/zmd-7.1.1/po/pt_BR.po 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-26 20:31-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 <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -146,7 +146,7 @@ msgid "Resolvable {0} is already installed." msgstr "O bundle '{0}' já está instalado." -#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146 +#: modules/linux/Transaction.cs:200 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -418,12 +418,7 @@ msgid "A daemon is already running" msgstr "Já existe um daemon em execução" -#. Expire old cached files -#: src/Daemon.cs:281 -msgid "Expiring cached files..." -msgstr "Expirando arquivos em cache..." - -#: src/Daemon.cs:305 +#: src/Daemon.cs:307 msgid "Loading trusted certificates..." msgstr "Carregando certificados confiáveis..." @@ -543,8 +538,8 @@ msgstr "Endereço IP para vincular a (vazio significa \"todos\")" #: src/Prefs.cs:315 -msgid "Cache downloaded packages and metadata" -msgstr "O cache fez download de pacotes e metadados" +msgid "The directory to store cached packages and metadata" +msgstr "O diretório para armazenar pacotes e metadados em cache" #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400 @@ -552,33 +547,33 @@ msgstr "Cache" #: src/Prefs.cs:327 -msgid "The directory to store cached packages and metadata" -msgstr "O diretório para armazenar pacotes e metadados em cache" - -#: src/Prefs.cs:339 msgid "The maximum number of days to cache a file" msgstr "O número máximo de dias para manter um arquivo em cache" -#: src/Prefs.cs:351 +#: src/Prefs.cs:339 msgid "The maximum number of simultaneous downloads" msgstr "O número máximo de downloads simultâneos" -#: src/Prefs.cs:363 +#: src/Prefs.cs:351 msgid "The maximum number of download retries" msgstr "O número máximo de tentativas de download" -#: src/Prefs.cs:375 +#: src/Prefs.cs:363 msgid "The number of milliseconds to delay before retrying a download" msgstr "Intervalo em milissegundos antes de uma nova tentativa de download" -#: src/Prefs.cs:387 +#: src/Prefs.cs:375 msgid "Automatically clean up the cache" msgstr "Limpar automaticamente o cache" -#: src/Prefs.cs:399 +#: src/Prefs.cs:387 msgid "The maximum size of the cache (in mb)" msgstr "O tamanho máximo do cache (em mb)" +#: src/Prefs.cs:399 +msgid "If true, never allow the cache to grow past the maximum size" +msgstr "" + #: src/Prefs.cs:411 msgid "Whether or not verified SSL certificates are required" msgstr "Indica se há necessidade de certificados SSL verificados ou não" @@ -744,22 +739,26 @@ msgid "System" msgstr "sistema" -#: src/WebCache.cs:416 src/WebCache.cs:419 +#: src/WebCache.cs:332 +msgid "Expiring cached files..." +msgstr "Expirando arquivos em cache..." + +#: src/WebCache.cs:423 src/WebCache.cs:426 #, csharp-format msgid "Download failed: ({0}) {1}" msgstr "Falha de download: ({0}) {1}" -#: src/WebCache.cs:473 +#: src/WebCache.cs:480 #, csharp-format msgid "File not found: {0}" msgstr "Arquivo não encontrado: {0}" -#: src/WebCache.cs:502 +#: src/WebCache.cs:509 #, csharp-format msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:886 +#: src/WebCache.cs:893 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Versão de armazenamento de cache desconhecida '{0}'" @@ -828,6 +827,9 @@ msgid "No registration URL is available" msgstr "Nenhum URL de registro disponível" +#~ msgid "Cache downloaded packages and metadata" +#~ msgstr "O cache fez download de pacotes e metadados" + #~ msgid "The system catalog" #~ msgstr "O catálogo do sistema" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog --- old/zmd-7.1.1/src/ChangeLog 2006-03-23 18:37:20.000000000 +0100 +++ new/zmd-7.1.1/src/ChangeLog 2006-03-29 02:26:06.000000000 +0200 @@ -1,3 +1,18 @@ +2006-03-28 James Willcox <james(a)ximian.com> + + * DaemonProperties.cs: add MonoVersion property, which uses evil + hacks to get which version of mono we're using. + * Daemon.cs: log the above + * DaemonInfo.cs: add MonoVersion + +2006-03-28 James Willcox <james(a)ximian.com> + + * WebCache.cs: lots of miscellaneous cache expiration fixes + * DaemonHealth.cs: add a CleanCache method + * Prefs.cs: nuke the 'cache-enabled' and introduce a new + cache-max-size-hard-limit pref. + * Daemon.cs: don't expire cached entries when coming out of sleep + 2006-03-23 Chris Rivera <cmr(a)ximian.com> * BundleCapability.cs: mark SubscribeCatalog with the subscribe privilege. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/Daemon.cs new/zmd-7.1.1/src/Daemon.cs --- old/zmd-7.1.1/src/Daemon.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/Daemon.cs 2006-03-29 02:26:06.000000000 +0200 @@ -271,6 +271,7 @@ Log.InitializeLogging (BuildConfig.LOGFILE); log.Info (String.Format ("Starting ZMD version {0}", BuildConfig.VERSION)); + log.InfoFormat ("Using {0}", DaemonProperties.MonoVersion); PreferenceManager.AutoregisterPreferences (); @@ -278,8 +279,9 @@ DaemonProperties.Target = OSTargetParser.ParseResource ("ostargets"); // Expire old cached files - log.Info (GettextCatalog.GetString ("Expiring cached files...")); - WebCache.Expire (); + if (!IsSleepResume && PreferenceManager.GetBoolean ("cache-cleanup-enabled")) { + WebCache.Expire (); + } // Register the 'noop' and 'file' bundles BundleManager.Register (typeof (NoopBundle), "noop"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/DaemonHealth.cs new/zmd-7.1.1/src/DaemonHealth.cs --- old/zmd-7.1.1/src/DaemonHealth.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/DaemonHealth.cs 2006-03-29 02:26:06.000000000 +0200 @@ -65,10 +65,15 @@ info.Target = DaemonProperties.Target; info.RssSize = DaemonProperties.RssSize; info.IsNetworkConnected = NetworkStatus.IsNetworkConnected; - + info.MonoVersion = DaemonProperties.MonoVersion; + return info; } + public void CleanCache () { + WebCache.Expire (); + } + public static void AddProperty (string name, string value) { props[name] = value; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/DaemonInfo.cs new/zmd-7.1.1/src/DaemonInfo.cs --- old/zmd-7.1.1/src/DaemonInfo.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/DaemonInfo.cs 2006-03-29 02:26:06.000000000 +0200 @@ -32,6 +32,7 @@ public OSTarget Target; public long RssSize; public bool IsNetworkConnected; + public string MonoVersion; public IDictionary Properties; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/DaemonProperties.cs new/zmd-7.1.1/src/DaemonProperties.cs --- old/zmd-7.1.1/src/DaemonProperties.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/DaemonProperties.cs 2006-03-29 02:26:06.000000000 +0200 @@ -25,6 +25,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Runtime.InteropServices; +using System.Reflection; using Mono.Unix; using Novell.Zenworks.Zmd.Public; @@ -33,7 +34,8 @@ public class DaemonProperties { private static Arch arch = Arch.Unknown; - + private static string monover = null; + public static OSTarget Target; public static long RssSize { @@ -54,6 +56,23 @@ return arch; } } + + public static string MonoVersion { + get { + if (monover == null) { + Type type = Assembly.GetAssembly (typeof (string)).GetType ("Mono.Runtime", false); + if (type != null) { + MethodInfo method = type.GetMethod ("GetDisplayName", BindingFlags.Static | BindingFlags.NonPublic); + if (method != null) { + object o = method.Invoke (null, null); + monover = (string) o; + } + } + } + + return monover; + } + } } internal class ProcReader { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/IDaemonHealth.cs new/zmd-7.1.1/src/IDaemonHealth.cs --- old/zmd-7.1.1/src/IDaemonHealth.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/IDaemonHealth.cs 2006-03-29 02:26:06.000000000 +0200 @@ -22,5 +22,6 @@ namespace Novell.Zenworks.Zmd.Public { public interface IDaemonHealth { DaemonInfo Ping (); + void CleanCache (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/Prefs.cs new/zmd-7.1.1/src/Prefs.cs --- old/zmd-7.1.1/src/Prefs.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/Prefs.cs 2006-03-29 02:26:06.000000000 +0200 @@ -308,18 +308,6 @@ } [Serializable] - internal class CacheEnabledPref : Preference { - public CacheEnabledPref () { - this.name = "cache-enabled"; - this.section = "Cache"; - this.description = GettextCatalog.GetString ("Cache downloaded packages and metadata"); - this.category = GettextCatalog.GetString ("Cache"); - this.type = typeof (bool); - this.default_value = (bool) true; - } - } - - [Serializable] internal class CacheDirPref : Preference { public CacheDirPref () { this.name = "cache-directory"; @@ -404,6 +392,18 @@ } [Serializable] + internal class CacheMaxLimitPref : Preference { + public CacheMaxLimitPref () { + this.name = "cache-max-size-hard-limit"; + this.section = "Cache"; + this.description = GettextCatalog.GetString ("If true, never allow the cache to grow past the maximum size"); + this.category = GettextCatalog.GetString ("Cache"); + this.type = typeof (bool); + this.default_value = (bool) false; + } + } + + [Serializable] internal class ValidCertPref : Preference { public ValidCertPref () { this.name = "require-verified-certs"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/WebCache.cs new/zmd-7.1.1/src/WebCache.cs --- old/zmd-7.1.1/src/WebCache.cs 2006-03-22 20:03:40.000000000 +0100 +++ new/zmd-7.1.1/src/WebCache.cs 2006-03-29 02:26:06.000000000 +0200 @@ -271,7 +271,7 @@ try { foreach (string file in Directory.GetFiles (dir)) { FileInfo info = new FileInfo (file); - if (info.CreationTime < minAge) + if (minAge == DateTime.MinValue || info.CreationTime < minAge) list.Add (info); } @@ -315,8 +315,13 @@ if (!PreferenceManager.GetBoolean ("cache-cleanup-enabled")) return; - ExpireByDate (date, dir); - ExpireBySize (size, dir, DateTime.Now - TimeSpan.FromDays (1)); + if (DateTime.Now - date > TimeSpan.FromDays (1)) { + ExpireByDate (date, dir); + } + + if (size > 0) { + ExpireBySize (size, dir, DateTime.MinValue); + } } public static void Expire (DateTime date, long size) { @@ -324,13 +329,15 @@ } public static void Expire () { + log.Info (GettextCatalog.GetString ("Expiring cached files...")); + int days = PreferenceManager.GetInteger ("max-cache-age"); DateTime age = DateTime.Now.Subtract (TimeSpan.FromDays ((double) days)); long size = PreferenceManager.GetInteger ("cache-max-size-in-mb"); Expire (age, size); } - public static long Size (string dir) { + public static long GetSize (string dir) { long size = 0; try { @@ -340,7 +347,7 @@ } foreach (string child in Directory.GetDirectories (dir)) { - size += Size (child); + size += GetSize (child); } } catch (DirectoryNotFoundException e) { // That's ok. @@ -366,8 +373,8 @@ return null; } - public static long Size () { - return Size (PreferenceManager.GetString ("cache-directory")); + public static long GetSize () { + return GetSize (PreferenceManager.GetString ("cache-directory")); } public string Download (DownloadProgress progress) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Wed Mar 29 10:18:11 CEST 2006. -------- --- /work/SRC/all/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-27 13:37:13.000000000 +0200 +++ /work/src/done/STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 06:35:07.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 06:33:39 CEST 2006 - kkaempf(a)suse.de + +- adapt to catalogs table change in zmd, now passes 'subscribed' + (#161395) +- rev 2734, needs zmd >= rev 26297 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.oDIxTG/_old 2006-03-29 10:17:33.000000000 +0200 +++ /var/tmp/diff_new_pack.oDIxTG/_new 2006-03-29 10:17:33.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: 18 +Release: 19 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,10 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Wed Mar 29 2006 - kkaempf(a)suse.de +- adapt to catalogs table change in zmd, now passes 'subscribed' + (#161395) +- rev 2734, needs zmd >= rev 26297 * Mon Mar 27 2006 - visnov(a)suse.cz - try to use source alias for YaST source - rev 2697 ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ ++++ 11106 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/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-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/Makefile.am 2006-03-28 22:17:23.000000000 +0200 @@ -23,12 +23,12 @@ update-status \ transact -query_system_SOURCES = query-system.cc -query_files_SOURCES = query-files.cc -resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h -transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h -parse_metadata_SOURCES = parse-metadata.cc -package_files_SOURCES = package-files.cc -find_file_SOURCES = find-file.cc -update_status_SOURCES = update-status.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 +transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h zmd-backend.cc +parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc +package_files_SOURCES = package-files.cc zmd-backend.cc +find_file_SOURCES = find-file.cc zmd-backend.cc +update_status_SOURCES = update-status.cc zmd-backend.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/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-14 15:08:30.000000000 +0100 +++ new/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-29 06:31:17.000000000 +0200 @@ -79,7 +79,7 @@ const char *query = // 0 1 2 3 4 5 - "SELECT id, name, alias, description, priority, priority_unsubd " + "SELECT id, name, alias, description, priority, subscribed " "FROM catalogs"; sqlite3_stmt *handle = NULL; @@ -112,16 +112,21 @@ text = (const char *) sqlite3_column_text( handle, 3 ); if (text != NULL) desc = text; unsigned priority = sqlite3_column_int( handle, 4 ); - unsigned priority_unsub = sqlite3_column_int( handle, 5 ); + int subscribed = sqlite3_column_int( handle, 5 ); MIL << "id " << id << ", name " << name << ", alias " << alias << ", desc " << desc << ", prio " << priority - << ", pr. un " << priority_unsub + << ", subs " << subscribed << endl; + if (subscribed == 0) { + MIL << "Not subscribed, skipping" << endl; + continue; + } + if (alias.empty()) alias = name; if (desc.empty()) desc = alias; @@ -133,7 +138,6 @@ impl->setZmdName( name ); impl->setZmdDescription ( desc ); impl->setPriority( priority ); - impl->setPriorityUnsubscribed( priority_unsub ); impl->attachDatabase( _db ); impl->attachIdMap( &_idmap ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/find-file.cc new/zmd-backend-7.1.1/src/find-file.cc --- old/zmd-backend-7.1.1/src/find-file.cc 2006-03-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/find-file.cc 2006-03-28 22:25:06.000000000 +0200 @@ -39,26 +39,8 @@ MIL << "-------------------------------------" << endl; MIL << "START find-file " << argv[1] << " " << argv[2] << endl; - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } - - Target_Ptr target; - - try { - God->initTarget( "/", true ); - target = God->target(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - return 1; - } + ZYpp::Ptr God = backend::getZYpp(); + Target_Ptr target = backend::initTarget( God ); string name = target->rpmDb().whoOwnsFile( argv[2] ); if (name.empty()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/package-files.cc new/zmd-backend-7.1.1/src/package-files.cc --- old/zmd-backend-7.1.1/src/package-files.cc 2006-03-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/package-files.cc 2006-03-28 22:25:11.000000000 +0200 @@ -228,32 +228,13 @@ MIL << "-------------------------------------" << endl; MIL << "START package-files " << argv[1] << " " << argv[2] << endl; - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } - DbAccess db(argv[1]); if (!db.openDb( true )) // open for writing return 1; - Target_Ptr target; - - try { - God->initTarget( "/", true ); - target = God->target(); - } - catch( const Exception & excpt_r ) { - ERR << "Can't initialize target." << endl; - ZYPP_CAUGHT( excpt_r ); - return 1; - } + ZYpp::Ptr God = backend::getZYpp(); + Target_Ptr target = backend::initTarget( God ); int result = package_files( db.db(), str::strtonum<long long>( argv[2] ), target ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/parse-metadata.cc new/zmd-backend-7.1.1/src/parse-metadata.cc --- old/zmd-backend-7.1.1/src/parse-metadata.cc 2006-03-27 13:08:34.000000000 +0200 +++ new/zmd-backend-7.1.1/src/parse-metadata.cc 2006-03-28 22:25:14.000000000 +0200 @@ -222,15 +222,7 @@ // database type path/uri catalog/alias MIL << "START parse-metadata " << argv[1] << " " << argv[2] << " " << argv[3] << " " << argv[4] << endl; - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } + ZYpp::Ptr God = backend::getZYpp(); manager = SourceManager::sourceManager(); if (! restore_sources ()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/query-files.cc new/zmd-backend-7.1.1/src/query-files.cc --- old/zmd-backend-7.1.1/src/query-files.cc 2006-03-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-files.cc 2006-03-28 22:28:46.000000000 +0200 @@ -402,30 +402,15 @@ MIL << "-------------------------------------" << endl; MIL << "START query-files " << argv[1] << " " << argv[2] << " " << ((argc>3)?argv[3]:"") << endl; - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } - - try { - God->initTarget( "/", true ); - } - catch( const Exception & excpt_r ) { - ERR << "Can't initialize target." << endl; - ZYPP_CAUGHT( excpt_r ); - return 1; - } + ZYpp::Ptr God = backend::getZYpp(); DbAccess db(argv[1]); if (!db.openDb( true )) // open for writing return false; + backend::initTarget( God ); + if (strcmp( argv[2], CATALOGSYNC ) == 0) { MIL << "Doing a catalog sync" << endl; sync_catalogs( db ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/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-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-system.cc 2006-03-28 22:25:22.000000000 +0200 @@ -136,23 +136,8 @@ MIL << "-------------------------------------" << endl; MIL << "START query-system " << argv[1] << endl; - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } - - try { - God->initTarget("/"); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - return 1; - } + ZYpp::Ptr God = backend::getZYpp(); + Target_Ptr target = backend::initTarget( God ); DbAccess db( argv[1] ); if (!db.openDb( true )) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/resolve-dependencies.cc new/zmd-backend-7.1.1/src/resolve-dependencies.cc --- old/zmd-backend-7.1.1/src/resolve-dependencies.cc 2006-03-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/resolve-dependencies.cc 2006-03-28 22:25:27.000000000 +0200 @@ -75,17 +75,7 @@ if (!db.openDb(false)) return 1; - // start ZYPP - - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } + ZYpp::Ptr God = backend::getZYpp(); // load the catalogs and resolvables from sqlite db diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/transact.cc new/zmd-backend-7.1.1/src/transact.cc --- old/zmd-backend-7.1.1/src/transact.cc 2006-03-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/transact.cc 2006-03-28 22:25:32.000000000 +0200 @@ -88,15 +88,8 @@ // start ZYPP - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } + ZYpp::Ptr God = backend::getZYpp(); + Target_Ptr target = backend::initTarget( God ); // load the catalogs and resolvables from sqlite db @@ -127,16 +120,6 @@ return 0; } - try { - God->initTarget( "/", true ); - } - catch ( Exception & expt_r ) { - ZYPP_CAUGHT( expt_r ); - cout << "3|" << expt_r.asUserString() << endl; - cerr << expt_r.asString() << endl; - return 1; - } - RpmCallbacks r_callbacks; // init and connect rpm progress callbacks MediaChangeCallback m_callback; // init and connect media change callback diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/update-status.cc new/zmd-backend-7.1.1/src/update-status.cc --- old/zmd-backend-7.1.1/src/update-status.cc 2006-03-27 11:10:54.000000000 +0200 +++ new/zmd-backend-7.1.1/src/update-status.cc 2006-03-28 22:25:38.000000000 +0200 @@ -159,15 +159,7 @@ // start ZYPP - ZYpp::Ptr God; - try { - God = zypp::getZYpp(); - } - catch (Exception & excpt_r) { - ZYPP_CAUGHT (excpt_r); - cerr << "Couldn't aquire Zypp lock" << endl; - return 2; - } + ZYpp::Ptr God = backend::getZYpp(); // load the catalogs and resolvables from sqlite db diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/zmd-backend.cc new/zmd-backend-7.1.1/src/zmd-backend.cc --- old/zmd-backend-7.1.1/src/zmd-backend.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-backend-7.1.1/src/zmd-backend.cc 2006-03-28 22:28:14.000000000 +0200 @@ -0,0 +1,48 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +// zmd-backend.cc +// ZMD backend helpers + +#include "zmd-backend.h" + +using namespace zypp; +using namespace std; + +namespace backend { + +ZYpp::Ptr +getZYpp() +{ + ZYpp::Ptr Z = NULL; + try { + Z = getZYpp(); + } + catch (Exception & excpt_r) { + ZYPP_CAUGHT (excpt_r); + cout << "3|A transaction is already in progress." << endl; + cerr << "A transaction is already in progress." << endl; + exit(1); + } + return Z; +} + +Target_Ptr +initTarget( ZYpp::Ptr Z ) +{ + Target_Ptr T; + + try { + Z->initTarget( "/", true ); // its always "/", and we never populate the pool (commit_only = true) + T = Z->target(); + } + catch (Exception & excpt_r) { + ZYPP_CAUGHT (excpt_r); + cout << "3|" << excpt_r.asUserString() << endl; + cerr << excpt_r.asString() << endl; + exit(1); + } + return T; +} + +}; + +// EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1/src/zmd-backend.h new/zmd-backend-7.1.1/src/zmd-backend.h --- old/zmd-backend-7.1.1/src/zmd-backend.h 2006-03-14 15:08:30.000000000 +0100 +++ new/zmd-backend-7.1.1/src/zmd-backend.h 2006-03-28 22:24:51.000000000 +0200 @@ -3,9 +3,19 @@ #ifndef ZMD_BACKEND_H #define ZMD_BACKEND_H -#include "zypp/base/LogControl.h" +#include <zypp/base/LogControl.h> +#include <zypp/ZYpp.h> #define ZMD_BACKEND_LOG "/var/log/zmd-backend.log" +namespace backend { + +// get ZYpp pointer, exit(1) if locked +zypp::ZYpp::Ptr getZYpp(); + +// init Target (root="/", commit_only=true), exit(1) on error +zypp::Target_Ptr initTarget( zypp::ZYpp::Ptr Z ); + +} #endif // ZMD_BACKEND_H ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package libzypp checked in at Wed Mar 29 10:17:26 CEST 2006. -------- --- /work/SRC/all/libzypp/libzypp.changes 2006-03-27 23:58:00.000000000 +0200 +++ /work/src/done/STABLE/libzypp/libzypp.changes 2006-03-29 10:02:39.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 29 09:13:51 CEST 2006 - visnov(a)suse.de + +- added support for external scripts to metadata (#159928) (jsrain) +- fixed handling of Language resolvables (ma) +- fix leak in rpmdb (dmacvicar) +- added softlock for autoyast (#159466) (ma) +- Fixed exceptions in doGetFileCopy() to show full url + including the file instead of just the media base url. (mt) +- Provide Language::summary (ma) +- check patterns and selections file exist + before veryfing them (#161300) (dmacvicar) +- added YUM metadata checksum computation (jsrain) +- added interface to patch of a message (jsrain) +- r2734 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.kJJD5Z/_old 2006-03-29 10:17:19.000000000 +0200 +++ /var/tmp/diff_new_pack.kJJD5Z/_new 2006-03-29 10:17:19.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 64 +Release: 65 Source: zypp-0.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -104,6 +104,19 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Wed Mar 29 2006 - visnov(a)suse.de +- added support for external scripts to metadata (#159928) (jsrain) +- fixed handling of Language resolvables (ma) +- fix leak in rpmdb (dmacvicar) +- added softlock for autoyast (#159466) (ma) +- Fixed exceptions in doGetFileCopy() to show full url + including the file instead of just the media base url. (mt) +- Provide Language::summary (ma) +- check patterns and selections file exist + before veryfing them (#161300) (dmacvicar) +- added YUM metadata checksum computation (jsrain) +- added interface to patch of a message (jsrain) +- r2734 * Mon Mar 27 2006 - jsrain(a)suse.de - added support for external scripts to metadata (#159928) - r2709 ++++++ zypp-0.0.0.tar.bz2 ++++++ /work/SRC/all/libzypp/zypp-0.0.0.tar.bz2 /work/src/done/STABLE/libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aaa_base
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package aaa_base checked in at Wed Mar 29 02:13:27 CEST 2006. -------- --- /work/SRC/all/BASE/aaa_base/aaa_base.changes 2006-03-23 18:06:52.000000000 +0100 +++ /work/src/done/STABLE/aaa_base/aaa_base.changes 2006-03-29 02:09:12.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 02:08:28 CEST 2006 - ro(a)suse.de + +- added ShouldStart for boot.multipath to boot.localfs (#160511) +- added update from ttyS0 to ttySG0 for SGI Altix in postinstall + (#140401) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.jaH9fF/_old 2006-03-29 02:13:15.000000000 +0200 +++ /var/tmp/diff_new_pack.jaH9fF/_new 2006-03-29 02:13:15.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Autoreqprov: on Version: 10.1 -Release: 12 +Release: 14 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -143,6 +143,10 @@ %defattr(-,root,root) %changelog -n aaa_base +* Wed Mar 29 2006 - ro(a)suse.de +- added ShouldStart for boot.multipath to boot.localfs (#160511) +- added update from ttyS0 to ttySG0 for SGI Altix in postinstall + (#140401) * Thu Mar 23 2006 - dmueller(a)suse.de - Fix init 3/rcxdm stop for default DISPLAYMANAGER * Thu Mar 23 2006 - werner(a)suse.de ++++++ aaa_base.post ++++++ --- /work/SRC/all/BASE/aaa_base/aaa_base.post 2006-03-17 16:34:41.000000000 +0100 +++ /work/src/done/STABLE/aaa_base/aaa_base.post 2006-03-29 02:12:26.000000000 +0200 @@ -343,4 +343,31 @@ rm -f /etc/fstab.$$ fi +# IA64 Altix update hook +if test -d /proc/sgi_sn ; then + if grep -q "console=ttyS0" /etc/elilo.conf ; then + echo "replacing ttyS0 by ttySG0 in elilo.conf, inittab and securetty files" + # + rm -f /etc/elilo.conf.tmp + sed -e "s/console=ttyS0/console=ttySG0/g" /etc/elilo.conf > /etc/elilo.conf.tmp + cat /etc/elilo.conf.tmp > /etc/elilo.conf + rm -f /etc/elilo.conf.tmp + # + rm -f /etc/inittab.tmp + sed -e "s/getty$.*$ttyS0/getty\1ttySG0/g" /etc/inittab > /etc/inittab.tmp + cat /etc/inittab.tmp > /etc/inittab + rm -f /etc/inittab.tmp + # + rm -f /etc/securetty.tmp + sed -e "s/ttyS0/ttySG0/g" /etc/securetty > /etc/securetty.tmp + cat /etc/securetty.tmp > /etc/securetty + rm -f /etc/securetty.tmp + # + if grep -q /boot/efi /proc/mounts ; then + echo "calling elilo to update" + /sbin/elilo || true + fi + fi +fi + exit 0 ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2006-03-22 11:31:24.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2006-03-29 01:02:39.000000000 +0200 @@ -8,7 +8,7 @@ ### BEGIN INIT INFO # Provides: boot.localfs # Required-Start: boot.udev boot.loadmodules -# Should-Start: boot.ibmsis boot.md boot.lvm dasd_devfs_compat boot.scsidev +# Should-Start: boot.ibmsis boot.md boot.lvm dasd_devfs_compat boot.scsidev boot.multipath # Required-Stop: # Default-Start: B # Default-Stop: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aaa_skel
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package aaa_skel checked in at Wed Mar 29 02:12:49 CEST 2006. -------- --- /work/SRC/all/BASE/aaa_skel/aaa_skel.changes 2006-02-24 21:43:00.000000000 +0100 +++ /work/src/done/STABLE/aaa_skel/aaa_skel.changes 2006-03-29 01:30:54.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 01:29:09 CEST 2006 - ro(a)suse.de + +- added .inputrc with commented examples for bell-style (#156588) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_skel.spec ++++++ --- /var/tmp/diff_new_pack.vtN5qt/_old 2006-03-29 02:12:35.000000000 +0200 +++ /var/tmp/diff_new_pack.vtN5qt/_new 2006-03-29 02:12:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aaa_skel (Version 2006.2.24) +# spec file for package aaa_skel (Version 2006.3.29) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Group: System/Fhs Autoreqprov: on Summary: Skeleton for Default Users -Version: 2006.2.24 +Version: 2006.3.29 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_skel.tar.bz2 @@ -44,6 +44,8 @@ %changelog -n aaa_skel +* Wed Mar 29 2006 - ro(a)suse.de +- added .inputrc with commented examples for bell-style (#156588) * Fri Feb 24 2006 - mfabian(a)suse.de - Bugzilla #152512: /etc/skel/Documents/.directory contains some non-UTF-8 garbage. ++++++ aaa_skel.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/skel/.inputrc new/etc/skel/.inputrc --- old/etc/skel/.inputrc 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/skel/.inputrc 2006-03-29 01:31:52.000000000 +0200 @@ -0,0 +1,29 @@ +################################################################################ +## ~/.inputrc +## +## Control the behaviour of the readline library used e.g. +## by the bash in the interactive mode for line editing. +## +################################################################################ +# +# The bell style used e.g. on error or tab completion, possible values +# are `none', `visible', and `audible' the ringing the bell. +# +#set bell-style none + +# +# If set to on, words which have more than one possible completion without +# any possible partial completion cause the matches to be listed immediately +# instead of ringing the bell. +# +#show-all-if-unmodified on + +# +# If set to on, words which have more than one possible completion cause the +# matches to be listed immediately instead of ringing the bell. +# +#show-all-if-ambiguous on + +# +# end +# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-volume-manager
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package gnome-volume-manager checked in at Wed Mar 29 00:39:52 CEST 2006. -------- --- /work/SRC/all/GNOME/gnome-volume-manager/gnome-volume-manager.changes 2006-03-22 17:36:39.000000000 +0100 +++ /work/src/done/STABLE/gnome-volume-manager/gnome-volume-manager.changes 2006-03-29 00:14:39.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Mar 28 22:56:40 CEST 2006 - fejj(a)suse.de + +- Added patches for bugs #119900 and #153241 + 119900: Improve default mount options + 153241: Creating Raid 0 on PPC getting device busy error + +------------------------------------------------------------------- New: ---- 119900.patch 153241.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-volume-manager.spec ++++++ --- /var/tmp/diff_new_pack.Mf4p3O/_old 2006-03-29 00:39:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Mf4p3O/_new 2006-03-29 00:39:46.000000000 +0200 @@ -15,7 +15,7 @@ %define prefix /opt/gnome %define sysconfdir /etc%{prefix} Version: 1.5.15 -Release: 6 +Release: 9 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL @@ -28,6 +28,8 @@ Patch3: 334540.patch Patch4: 158750.patch Patch5: gvm-2GB-notify.patch +Patch6: 119900.patch +Patch7: 153241.patch Autoreqprov: on Requires: control-center2 Requires: notification-daemon @@ -59,6 +61,8 @@ %patch3 %patch4 %patch5 +%patch6 +%patch7 sed -i 's/$ALL_LINGUAS.* $no /\1/' configure.in %build @@ -103,6 +107,10 @@ /opt/gnome/share/gnome-volume-manager %changelog -n gnome-volume-manager +* Tue Mar 28 2006 - fejj(a)suse.de +- Added patches for bugs #119900 and #153241 + 119900: Improve default mount options + 153241: Creating Raid 0 on PPC getting device busy error * Wed Mar 22 2006 - dobey(a)suse.de - Added gvm-2GB-notify.patch to only notify the user of low disk space if the free space is less than 2GB and past the threshold ++++++ 119900.patch ++++++ Index: src/manager.c =================================================================== RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v retrieving revision 1.141 diff -u -r1.141 manager.c --- src/manager.c 21 Mar 2006 21:48:30 -0000 1.141 +++ src/manager.c 28 Mar 2006 20:36:05 -0000 @@ -1629,6 +1629,9 @@ } if (!strcmp (fstype, "vfat")) { + if (opts & MOUNT_NOEXEC) + g_ptr_array_add (options, "noexec"); + /* preferably mount flush (opportunistic syncing) if available, else * mount sync for "small" volumes (that are likely to be thumb drives) */ @@ -1647,7 +1650,9 @@ } else if (!strcmp (fstype, "iso9660")) { /* only care about uid= and iocharset= */ } else if (!strcmp (fstype, "udf")) { - /* only care about uid= and iocharset= */ + /* also care about uid= and iocharset= */ + if (opts & MOUNT_NOATIME) + g_ptr_array_add (options, "noatime"); } if (opts & (MOUNT_IOCHARSET|MOUNT_UTF8)) { ++++++ 153241.patch ++++++ Index: src/manager.c =================================================================== RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v retrieving revision 1.143 diff -u -r1.143 manager.c --- src/manager.c 28 Mar 2006 20:49:21 -0000 1.143 +++ src/manager.c 28 Mar 2006 20:51:56 -0000 @@ -2035,6 +2035,9 @@ dbus_error_init (&error); + if (libhal_device_get_property_bool (hal_ctx, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) + goto out; + crypto = FALSE; /* is this a mountable volume? */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0