OpenBSD CVS

CVS log for src/usr.sbin/pkg_add/Attic/pkg_merge


[BACK] Up to [local] / src / usr.sbin / pkg_add

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.22, Fri Aug 26 08:46:09 2011 UTC (12 years, 9 months ago) by espie
Branch: MAIN
CVS Tags: HEAD
Changes since 1.21: +1 -1 lines
FILE REMOVED

zap fatpackages. nobody actually uses them.
accordingly, locations do not need to track architecture.

Revision 1.21 / (download) - annotate - [select for diffs], Wed Jul 28 12:19:54 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

pass state to Ustar objects, use it to display those pesky error and
fatal messages.

zap $opt_x from pkg_mklocated, do things like other commands do.

Revision 1.20 / (download) - annotate - [select for diffs], Sun Jul 4 19:34:06 2010 UTC (13 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.19: +11 -9 lines
Diff to previous 1.19 (colored)

remove  direct prints, pass thru state.

Revision 1.19 / (download) - annotate - [select for diffs], Wed Jun 30 11:22:23 2010 UTC (13 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.18: +21 -17 lines
Diff to previous 1.18 (colored)

modernize pkg_merge, avoid warning for link sizes.

Revision 1.18 / (download) - annotate - [select for diffs], Wed Jun 30 10:51:04 2010 UTC (13 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.17: +0 -0 lines
Diff to previous 1.17 (colored)

allow say and errsay to work without parameters, as it's ways common.
create verbose_system up in state, because it makes sense without verbose.

Revision 1.17 / (download) - annotate - [select for diffs], Wed Jun 30 10:41:41 2010 UTC (13 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.16: +1 -1 lines
Diff to previous 1.16 (colored)

whitespace cleanup

Revision 1.16 / (download) - annotate - [select for diffs], Wed Jun 9 11:57:21 2010 UTC (14 years ago) by espie
Branch: MAIN
Changes since 1.15: +2 -6 lines
Diff to previous 1.15 (colored)

common pattern reuse

Revision 1.15 / (download) - annotate - [select for diffs], Wed Jun 9 10:58:01 2010 UTC (14 years ago) by espie
Branch: MAIN
Changes since 1.14: +7 -5 lines
Diff to previous 1.14 (colored)

use State usage, so that I can get rid of duplicate code...

Revision 1.14 / (download) - annotate - [select for diffs], Mon May 10 09:17:55 2010 UTC (14 years, 1 month ago) by espie
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

whitespace fixes

Revision 1.13 / (download) - annotate - [select for diffs], Tue Nov 10 11:36:56 2009 UTC (14 years, 7 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.12: +1 -0 lines
Diff to previous 1.12 (colored)

bad espie: use strict/warnings consistently, and fix two nits and two
actual errors !

Revision 1.12 / (download) - annotate - [select for diffs], Fri Oct 10 04:35:31 2008 UTC (15 years, 8 months ago) by steven
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.11: +1 -0 lines
Diff to previous 1.11 (colored)

add rcs tags

ok espie

Revision 1.11 / (download) - annotate - [select for diffs], Mon Oct 6 09:36:17 2008 UTC (15 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.10: +1 -1 lines
Diff to previous 1.10 (colored)

turn the checksums stored in packing elements into real objects, so that
pkg_add becomes mostly independent of the type of checksum stored.

separate md5 into an abstract OpenBSD::digest class and an md5 subclass
with specific methods to compute checksums and serialize results, and create
an sha class that does the same thing with sha256 (with a base64 serializer)

Revision 1.10 / (download) - annotate - [select for diffs], Sat Jun 16 09:29:37 2007 UTC (16 years, 11 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.9: +2 -1 lines
Diff to previous 1.9 (colored)

use OpenBSD::Paths contents

Revision 1.9 / (download) - annotate - [select for diffs], Mon Jun 4 14:40:39 2007 UTC (17 years ago) by espie
Branch: MAIN
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 (colored)

some minor systematic changes.
- mark all regexps I can with /o if they can be compiled once.
- turn $o->method() into $o->method
- remove unneeded prototypes
- reduce split /re/ into split "string" where possible.

Revision 1.8 / (download) - annotate - [select for diffs], Wed May 2 13:59:19 2007 UTC (17 years, 1 month ago) by espie
Branch: MAIN
Changes since 1.7: +5 -4 lines
Diff to previous 1.7 (colored)

remove extraneous () in method call: $o->method() becomes $o->method

Revision 1.7 / (download) - annotate - [select for diffs], Sun Apr 29 11:09:29 2007 UTC (17 years, 1 month ago) by espie
Branch: MAIN
Changes since 1.6: +1 -1 lines
Diff to previous 1.6 (colored)

replace $p->visit('method') calls with $p->method
now that it works.

Revision 1.6 / (download) - annotate - [select for diffs], Sat Sep 24 12:52:18 2005 UTC (18 years, 8 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

pass actual items to prepare_long and check_name so that we can also
verify that modes/groups/owners are correct (code to come)

Revision 1.5 / (download) - annotate - [select for diffs], Sun Aug 7 14:18:04 2005 UTC (18 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.4: +4 -3 lines
Diff to previous 1.4 (colored)

wrapper around Ustar that replaces long names/links with LongName#/LongLink#.

The archive will unpack correctly with tar, except that those names won't
be preserved.

The wrapper checks names against the packing-list to restore the correct names
on the fly.

Put into a separate file, as it is an extension of Ustar proper, and we're
going to do more archive checking in the future.

Lots of tests by Bernd Ahlers. Comments by Tom Cosgrove.

Revision 1.4 / (download) - annotate - [select for diffs], Wed Jun 29 22:56:41 2005 UTC (18 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)

Usage().
noticed by deraadt@

Revision 1.3 / (download) - annotate - [select for diffs], Sun Jun 26 16:41:08 2005 UTC (18 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.2: +18 -4 lines
Diff to previous 1.2 (colored)

Handle hard links correctly: the names need to be aliased correctly for
pkg_merging, and the names need to lose the prefix path when getting
extracted.

Revision 1.2 / (download) - annotate - [select for diffs], Sun Jun 26 14:45:39 2005 UTC (18 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.1: +20 -7 lines
Diff to previous 1.1 (colored)

some useful statistics about shared files and size gains.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Jun 26 12:30:16 2005 UTC (18 years, 11 months ago) by espie
Branch: MAIN

new tool (not active yet): pkg_merge.
Can be used to merge several packages into a fat package.
Uses simple heuristics to find out a `nice' ordering for common files,
can handle semi-common prefixes.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.