mlot/alien
1
0
Fork 0
mirror of https://github.com/Project-OSS-Revival/alien.git synced 2026-04-24 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Be stricter about which patch files to apply by default. For old behavior

Browse Source 
use --anypatch.
   * Minor perl 5.8 fix.
This commit is contained in:
joey
2002-08-22 16:04:41 +00:00
parent 21393f2767
commit a295c7ad14
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Alien/Package/Deb.pm
View File

@@ -258,12 +258,13 @@ patches in.
sub getpatch { sub getpatch {
my $this=shift; my $this=shift;
my $anypatch=shift;
my @patches; my @patches;
foreach my $dir (@_) { foreach my $dir (@_) {
push @patches, glob("$dir/".$this->name."_".$this->version."-".$this->release."*.diff.gz"); push @patches, glob("$dir/".$this->name."_".$this->version."-".$this->release."*.diff.gz");
} }
unless (@patches) { if (! @patches && $anypatch) {
# Try not matching the revision, see if that helps. # Try not matching the revision, see if that helps.
foreach my $dir (@_) { foreach my $dir (@_) {
push @patches,glob("$dir/".$this->name."_".$this->version."*.diff.gz"); push @patches,glob("$dir/".$this->name."_".$this->version."*.diff.gz");

14
alien.pl
View File

@@ -135,6 +135,12 @@ Specify the patch to be used instead of automatically looking the patch up
in B</var/lib/alien>. This has no effect unless a debian package is being in B</var/lib/alien>. This has no effect unless a debian package is being
built. built.
=item B<--anypatch>
Be less strict about which patch file is used, perhaps attempting to use a patch
file for an older verson of the package. This is not guaranteed to always work;
older patches may necessarily not work with newer packages.
=item B<--nopatch> =item B<--nopatch>
Do not use any patch files. Do not use any patch files.
@@ -286,6 +292,7 @@ Usage: alien [options] file [...]
--patch=<patch> Specify patch file to use instead of automatically --patch=<patch> Specify patch file to use instead of automatically
looking for patch in /var/lib/alien. looking for patch in /var/lib/alien.
--nopatch Do not use patches. --nopatch Do not use patches.
--anypatch Use even old version os patches.
--single Like --generate, but do not create .orig --single Like --generate, but do not create .orig
directory. directory.
--fixperms Munge/fix permissions and owners. --fixperms Munge/fix permissions and owners.
@@ -310,7 +317,7 @@ EOF
# Start by processing the parameters. # Start by processing the parameters.
my (%destformats, $generate, $install, $single, $scripts, $patchfile, my (%destformats, $generate, $install, $single, $scripts, $patchfile,
$nopatch, $tgzdescription, $keepversion, $fixperms, $test); $nopatch, $tgzdescription, $keepversion, $fixperms, $test, $anypatch);
# Bundling is nice anyway, and it is required or Getopt::Long will confuse # Bundling is nice anyway, and it is required or Getopt::Long will confuse
# -T and -t. # -T and -t.
@@ -328,8 +335,9 @@ GetOptions(
"install|i", \$install, "install|i", \$install,
"single|s", sub { $single=1; $generate=1 }, "single|s", sub { $single=1; $generate=1 },
"scripts|c", \$scripts, "scripts|c", \$scripts,
"patch|p=s", \$patchfile, "patch=s", \$patchfile,
"nopatch", \$nopatch, "nopatch", \$nopatch,
"anypatch", \$anypatch,
"description=s", \$tgzdescription, "description=s", \$tgzdescription,
"keep-version|k", \$keepversion, "keep-version|k", \$keepversion,
"fixperms", \$fixperms, "fixperms", \$fixperms,
@@ -441,7 +449,7 @@ foreach my $file (@ARGV) {
$package->patchfile($patchfile) $package->patchfile($patchfile)
} }
else { else {
$package->patchfile($package->getpatch(patchdirs())); $package->patchfile($package->getpatch($anypatch, patchdirs()));
} }
} }

8
debian/changelog vendored
View File

@@ -1,3 +1,11 @@
alien (8.18) unstable; urgency=low
* Be stricter about which patch files to apply by default. For old behavior
use --anypatch.
* Minor perl 5.8 fix.
-- Joey Hess <joeyh@debian.org> Thu, 22 Aug 2002 12:10:39 -0400
alien (8.17) unstable; urgency=low alien (8.17) unstable; urgency=low
* When converting from rpm, do parent directory 755 chmods first, then * When converting from rpm, do parent directory 755 chmods first, then