Date: Tue, 07 Apr 2015 11:01:22 +0800 From: Ting-Wei Lan <lantw44@gmail.com> To: rrking@member.ams.org Cc: gnome@FreeBSD.org Subject: Re: FreeBSD Port: evolution-3.12.11 Message-ID: <1428375682.83748.18.camel@gmail.com> In-Reply-To: <20150406223140.VP8H0.482256.imail@fed1rmwml205> References: <20150406223140.VP8H0.482256.imail@fed1rmwml205>
next in thread | previous in thread | raw e-mail | index | archive | help
於 一，2015-04-06 於 19:31 -0700，Randall King 提到： > Hi, > > I had difficulty applying the patch. It may have to do with the code being > around line 570 on the version that I have (evolution 3.12.11). It seems tab characters in the previous patch was replaced by whitespaces ... Instead of pasting the new patch inline, I put the new patch here: http://jhbuild.csie.org:9080/patches/evolution-backup-tar.patch > > Further, if you re-order the options, then you will need to re-order the > subsequent arguments. This means the line following the corrected line should > be > > get_dir_level (data_dir), quotedfname, data_dir) > > and > > get_dir_level(config_dir), quotedfname, config_dir) Yes, I forgot to re-order printf arguments in the previous patch ... I re-order the options because putting --strip-components at the end of the tar command doesn't work on my FreeBSD 10.1 system. > > BTW, when building from ports, I discovered that evolution-data-server is a > required package, but the package wasn't installed by make. Instead, it just > stopped in the configuration. (This bug allowed me to edit in the patch > before building evolution). Doesn't USE_GNOME=evolutiondataserver3 in the Makefile pull in evolution-data -server? make build-depends-list shows /usr/ports/databases/evolution-data -server on my system. > > My diff command doesn't recognize the --git option. > The --git option is not needed. It just means the patch was generated by git. > --Randall R. King > > ---- Ting-Wei Lan <lantw44@gmail.com> wrote: > > 於 六，2015-04-04 於 22:19 -0700，Randall R. King 提到： > > > Hi, > > > > > > A quick note to let you know that I had difficulty restoring data from a > > > backup (whatever version was running under FreeBSD 9.2). After a careful > > > look at the debug messages, it looked like the tar commands used in the > > > restoration used the option --strip-components=3 (or 2), and the tar > > > command barfed on that option (the '=' sign should be a space). Hiding > > > tar and linking tar to gtar fixed the problem. Perhaps the script(s) for > > > restoration should either lose the equal sign on the --strip-components > > > option or use gtar instead of tar? > > > > Thanks for finding the cause of the bug. Does the following patch work for > > you? > > If yes then I will file an upstream bug report with this patch attached. > > > > diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup > > -restore/evolution-backup-tool.c > > index 9604513..3eef5f9 100644 > > --- a/modules/backup-restore/evolution-backup-tool.c > > +++ b/modules/backup-restore/evolution-backup-tool.c > > @@ -538,13 +538,13 @@ restore (const gchar *filename, > > g_mkdir_with_parents (e_get_user_config_dir (), 0700); > > > > command = g_strdup_printf ( > > - "cd $DATADIR && tar xzf %s %s --strip > > -components=%d", > > + "cd $DATADIR && tar --strip-components %d -xzf %s > > %s", > > quotedfname, data_dir, get_dir_level (data_dir)); > > run_cmd (command); > > g_free (command); > > > > command = g_strdup_printf ( > > - "cd $CONFIGDIR && tar xzf %s %s --strip > > -components=%d", > > + "cd $CONFIGDIR && tar --strip-components %d -xzf %s > > %s", > > quotedfname, config_dir, get_dir_level > > (config_dir)); > > run_cmd (command); > > g_free (command); > > > > > > > > > > Sincerely, > > > Randall R. King > > > > > > _______________________________________________ > > > freebsd-gnome@freebsd.org mailing list > > > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > > > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" > > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1428375682.83748.18.camel>