Front page

[PATCH] Include the root dir into kdirstat output

650881c8459f47aa90a838ffaeab9199
FRACTURE ANTENNA MINNOW

From: Ian Campbell <ijc@hellion.org.uk>
Date: Mon, 30 Jan 2017 10:48:04 +0000

   On Mon, 2017-01-30 at 11:25 +0100, SanskritFritz wrote:
   > Root directory is now excluded from kdirstat output done by obnam.
   > That solution was probably a workaround to a k4dirstat bug, however,
   > this broke displaying any --root="/" backups and since we now have
   > qdirstat (and k4dirstat became deprecated) which fixed the bug, it is
   > time to reintroduce the root dir into the kdirstat output. Discussion
   > with Ian about this can be read in the thread "Kdirstat merged to
   > Qdirstat".
   
   I agree that this return appears to be hiding a k4dirstat issue and
   should therefore be removed (i.e. I approve of this patch).
   
   FYI it seems that k4dirstat has a new upstream at https://bitbucket.org
   /jeromerobert/k4dirstat which is still active.
   
   I have reported https://bitbucket.org/jeromerobert/k4dirstat/issues/23/
   issue-with-root-directory-in-cache-file for the issue discovered here.
   
   Ian.
   
   > diff --git a/obnamlib/plugins/show_plugin.py
   > b/obnamlib/plugins/show_plugin.py
   > index 995a958c..79ccde10 100644
   > --- a/obnamlib/plugins/show_plugin.py
   > +++ b/obnamlib/plugins/show_plugin.py
   > @@ -314,9 +314,6 @@ class ShowPlugin(obnamlib.ObnamPlugin):
   >          enc_filename = enc_filename.replace(" ", "%20")
   >          enc_filename = enc_filename.replace("\t", "%09")
   > 
   > -        if filename == "/":
   > -            return
   > -
   >          self.app.output.write(
   >              "%s%s\t%d\t%#x\n" %
   >              (mode_str, enc_filename, size, mtime_sec))
   > 
   
   _______________________________________________
   obnam-dev mailing list
   obnam-dev@obnam.org
   http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
From: SanskritFritz <sanskritfritz@gmail.com>
Date: Mon, 30 Jan 2017 11:25:48 +0100

   Root directory is now excluded from kdirstat output done by obnam.
   That solution was probably a workaround to a k4dirstat bug, however,
   this broke displaying any --root="/" backups and since we now have
   qdirstat (and k4dirstat became deprecated) which fixed the bug, it is
   time to reintroduce the root dir into the kdirstat output. Discussion
   with Ian about this can be read in the thread "Kdirstat merged to
   Qdirstat".
   
   diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
   index 995a958c..79ccde10 100644
   --- a/obnamlib/plugins/show_plugin.py
   +++ b/obnamlib/plugins/show_plugin.py
   @@ -314,9 +314,6 @@ class ShowPlugin(obnamlib.ObnamPlugin):
            enc_filename = enc_filename.replace(" ", "%20")
            enc_filename = enc_filename.replace("\t", "%09")
   
   -        if filename == "/":
   -            return
   -
            self.app.output.write(
                "%s%s\t%d\t%#x\n" %
                (mode_str, enc_filename, size, mtime_sec))
   
   _______________________________________________
   obnam-dev mailing list
   obnam-dev@obnam.org
   http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
From: Lars Wirzenius <liw@liw.fi>
Date: Fri, 3 Mar 2017 21:05:58 +0200

   Thans, I've finally applied this, and pushed.
   
   On Mon, Jan 30, 2017 at 11:25:48AM +0100, SanskritFritz wrote:
   > Root directory is now excluded from kdirstat output done by obnam.
   > That solution was probably a workaround to a k4dirstat bug, however,
   > this broke displaying any --root="/" backups and since we now have
   > qdirstat (and k4dirstat became deprecated) which fixed the bug, it is
   > time to reintroduce the root dir into the kdirstat output. Discussion
   > with Ian about this can be read in the thread "Kdirstat merged to
   > Qdirstat".
   > 
   > diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
   > index 995a958c..79ccde10 100644
   > --- a/obnamlib/plugins/show_plugin.py
   > +++ b/obnamlib/plugins/show_plugin.py
   > @@ -314,9 +314,6 @@ class ShowPlugin(obnamlib.ObnamPlugin):
   >          enc_filename = enc_filename.replace(" ", "%20")
   >          enc_filename = enc_filename.replace("\t", "%09")
   > 
   > -        if filename == "/":
   > -            return
   > -
   >          self.app.output.write(
   >              "%s%s\t%d\t%#x\n" %
   >              (mode_str, enc_filename, size, mtime_sec))
   > 
   > _______________________________________________
   > obnam-dev mailing list
   > obnam-dev@obnam.org
   > http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
   >
From: Ian Campbell <ijc@hellion.org.uk>
Date: Tue, 07 Mar 2017 10:26:56 +0000

   On Fri, 2017-03-03 at 21:05 +0200, Lars Wirzenius wrote:
   > Thans, I've finally applied this, and pushed.
   
   Thanks!
   
   BTW the bug in k4dirtat[0] has also been fixed[1], although I haven't
   actually had a chance to test it yet.
   
   Ian.
   
   [0] https://bitbucket.org/jeromerobert/k4dirstat/issues/23/
   [1] https://bitbucket.org/jeromerobert/k4dirstat/commits/d626afc8c1e6
   
   _______________________________________________
   obnam-dev mailing list
   obnam-dev@obnam.org
   http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
From: SanskritFritz <sanskritfritz@gmail.com>
Date: Tue, 7 Mar 2017 10:51:28 +0100

   Nice, thanks!
   
   
   On Fri, Mar 3, 2017 at 8:05 PM, Lars Wirzenius <liw@liw.fi> wrote:
   
   > Thans, I've finally applied this, and pushed.
   >
   > On Mon, Jan 30, 2017 at 11:25:48AM +0100, SanskritFritz wrote:
   > > Root directory is now excluded from kdirstat output done by obnam.
   > > That solution was probably a workaround to a k4dirstat bug, however,
   > > this broke displaying any --root="/" backups and since we now have
   > > qdirstat (and k4dirstat became deprecated) which fixed the bug, it is
   > > time to reintroduce the root dir into the kdirstat output. Discussion
   > > with Ian about this can be read in the thread "Kdirstat merged to
   > > Qdirstat".
   > >
   > > diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_
   > plugin.py
   > > index 995a958c..79ccde10 100644
   > > --- a/obnamlib/plugins/show_plugin.py
   > > +++ b/obnamlib/plugins/show_plugin.py
   > > @@ -314,9 +314,6 @@ class ShowPlugin(obnamlib.ObnamPlugin):
   > >          enc_filename = enc_filename.replace(" ", "%20")
   > >          enc_filename = enc_filename.replace("\t", "%09")
   > >
   > > -        if filename == "/":
   > > -            return
   > > -
   > >          self.app.output.write(
   > >              "%s%s\t%d\t%#x\n" %
   > >              (mode_str, enc_filename, size, mtime_sec))
   > >
   > > _______________________________________________
   > > obnam-dev mailing list
   > > obnam-dev@obnam.org
   > > http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/
   > obnam-dev-obnam.org
   > >
   >
   > --
   > I want to build worthwhile things that might last. --joeyh
   >
From: SanskritFritz <sanskritfritz@gmail.com>
Date: Tue, 7 Mar 2017 16:23:11 +0100

   To test this In Debian, you'll have to wait a year or so :D
   Anyway, great news!
   
   
   On Tue, Mar 7, 2017 at 11:26 AM, Ian Campbell <ijc@hellion.org.uk> wrote:
   
   > On Fri, 2017-03-03 at 21:05 +0200, Lars Wirzenius wrote:
   > > Thans, I've finally applied this, and pushed.
   >
   > Thanks!
   >
   > BTW the bug in k4dirtat[0] has also been fixed[1], although I haven't
   > actually had a chance to test it yet.
   >
   > Ian.
   >
   > [0] https://bitbucket.org/jeromerobert/k4dirstat/issues/23/
   > [1] https://bitbucket.org/jeromerobert/k4dirstat/commits/d626afc8c1e6
   >