Package: pristine-tar
Version: 1.42
Severity: normal
File: /usr/bin/pristine-tar
Tags: patch
Dear Maintainer,
git-ubuntu is using pristine-tar. git-ubuntu tracks archive versions
of both ubuntu and debian packages (and orig tarballs). Because of the
fact that sometimes orig tarballs have differed within the same version
of a package, the pristine-tar branches are namespaced:
importer/ubuntu/pristine-tar
importer/debian/pristine-tar
In order for git-ubuntu to use the 'pristine-tar' cli, then to extract
original source tarballs we need to be able to specify the branch name.
So this is a request (and attached patch) for adding a '--branch' flag
to pristine-tar.
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Kernel: Linux 4.15.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages pristine-tar depends on:
ii libbz2-1.0 1.0.6-8.1
ii libc6 2.27-0ubuntu3
ii perl 5.26.1-5
ii tar 1.29b-2
ii xdelta 1.1.3-9.2
ii xdelta3 3.0.11-dfsg-1ubuntu1
ii zlib1g 1:1.2.11.dfsg-0ubuntu2
Versions of packages pristine-tar recommends:
ii bzip2 1.0.6-8.1
ii pbzip2 1.1.9-1build1
ii xz-utils 5.2.2-1.3
pristine-tar suggests no packages.
-- no debconf information
>From d9fdae97e557b4e7de28ad3bce1d662fe14885c5 Mon Sep 17 00:00:00 2001
From: Scott Moser <smo...@brickies.net>
Date: Tue, 10 Apr 2018 15:00:39 -0400
Subject: [PATCH] pristine-tar: add -b/--branch flag for specifying the branch.
Some repositories may not have the same naming convention for the
pristine-tar branch. One such example is the 'git ubuntu' work
that is being done.
This change allows tools using pristine-tar to provide the branch via
--branch=<branch>.
---
pristine-tar | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/pristine-tar b/pristine-tar
index 065582f..fb59bf6 100755
--- a/pristine-tar
+++ b/pristine-tar
@@ -118,6 +118,12 @@ Use this option to specify a custom commit message to
pristine-tar commit.
Applies to the B<commit> command.
+=item -b branch
+
+=item --branch=branch
+
+Use branch named B<branch> rather than the default 'pristine-tar'.
+
=item -s signaturefile
=item --signature-file=signaturefile
@@ -294,6 +300,7 @@ use constant {
my $recompress = 0;
my $recompress_theshold_bytes = 524288000;
my $recompress_theshold_percent = 30;
+my $branch = 'pristine-tar';
my ($message, $signature_file);
my $genversion =
version_from_env(XDELTA3, "xdelta" => XDELTA, "xdelta3" => XDELTA3);
@@ -314,6 +321,7 @@ dispatch(
},
options => {
"m|message=s" => \$message,
+ "b|branch=s" => \$branch,
"s|signature-file=s" => \$signature_file,
"r|recompress!" => \$recompress,
"B|recompress-threshold-bytes=i" => \$recompress_theshold_bytes,
@@ -333,6 +341,8 @@ Options:
-v, --verbose Turn on verbose output
-k, --keep Don't delete temporary files
-h, --help Display usage information
+ -b BRANCH, --branch=BRANCH
+ Use branch named B. default=pristine-tar
-m MSG, --message=MSG Set commit message
-s SIG, --signature-file Set signature file to be stored
together with the tarball
@@ -932,7 +942,6 @@ sub git_findbranch {
sub checkoutdelta {
my $tarball = shift;
- my $branch = "pristine-tar";
my $deltafile = basename($tarball) . ".delta";
my $idfile = basename($tarball) . ".id";
my $sigfile = basename($tarball) . ".asc";
@@ -986,7 +995,6 @@ sub commitdelta {
my $id = shift;
my $tarball = shift;
- my $branch = "pristine-tar";
my $deltafile = basename($tarball) . ".delta";
my $idfile = basename($tarball) . ".id";
my $sigfile = basename($tarball) . ".asc";
@@ -1137,7 +1145,6 @@ sub checkout {
}
sub list {
- my $branch = "pristine-tar";
my $vcs = vcstype();
if ($vcs eq "git") {
my $b = git_findbranch($branch, 1);
--
2.15.1
