This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=ae9abc1c6139f282a21714fe82e0db8659e3ec29

commit ae9abc1c6139f282a21714fe82e0db8659e3ec29
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Wed Aug 30 02:34:38 2023 +0200

    Dpkg::Source::Quilt: Switch get_patch_file() to be based off get_patch_dir()
    
    Do not use get_patch_file() with no argument as a means to get the
    patch directory, instead reverse the implementation around and use
    get_patch_dir() from get_patch_file(), which makes more sense, and
    fixes a perl warning introduced when the code changed to properly
    unpack arguments.
    
    Fixes: commit 309123b9e76a44cd8e394d87295e2d244d7e354c
---
 scripts/Dpkg/Source/Quilt.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/Dpkg/Source/Quilt.pm b/scripts/Dpkg/Source/Quilt.pm
index 9c1163524..30373e64a 100644
--- a/scripts/Dpkg/Source/Quilt.pm
+++ b/scripts/Dpkg/Source/Quilt.pm
@@ -247,7 +247,7 @@ sub get_db_version {
 
 sub find_problems {
     my $self = shift;
-    my $patch_dir = $self->get_patch_file();
+    my $patch_dir = $self->get_patch_dir();
     if (-e $patch_dir and not -d _) {
         return sprintf(g_('%s should be a directory or non-existing'), 
$patch_dir);
     }
@@ -283,12 +283,13 @@ sub get_db_dir {
 sub get_patch_file {
     my ($self, $file) = @_;
 
-    return File::Spec->catfile($self->{dir}, 'debian', 'patches', $file);
+    return File::Spec->catfile($self->get_patch_dir(), $file);
 }
 
 sub get_patch_dir {
     my $self = shift;
-    return $self->get_patch_file();
+
+    return File::Spec->catfile($self->{dir}, 'debian', 'patches');
 }
 
 ## METHODS BELOW ARE INTERNAL ##

-- 
Dpkg.Org's dpkg

Reply via email to