Skip to content

TypeError: can't concat str to bytes#60

Closed
kokopopse wants to merge 1 commit intobup:masterfrom
kokopopse:master
Closed

TypeError: can't concat str to bytes#60
kokopopse wants to merge 1 commit intobup:masterfrom
kokopopse:master

Conversation

@kokopopse
Copy link
Copy Markdown
Contributor

index 7c8ca26..3797724 100755
--- a/lib/cmd/restore-cmd.py
+++ b/lib/cmd/restore-cmd.py
@@ -192,7 +192,7 @@ def restore(repo, parent_path, name, item, top, sparse, numeric_ids, owner_map,
out.write(b'%s@ -> %s\n' % (fullname, meta.symlink_target))
else:
if verbosity >= 2:

  •        out.write(fullname + '\n')
    
  •        out.write(fullname + b'\n')
    

    orig_cwd = os.getcwd()
    try:
    ~
    ~
    ~
    ~
    ~

We discuss code changes on the mailing list bup-list@googlegroups.com,
but if you'd prefer to begin the process with a pull request, that's
just fine. We're happy to have the help.

In any case, please make sure each commit includes a

Signed-off-by: Someone someone@some.where

line in the commit message that matches the "Author" line so that
we'll be able to include your work in the project. See
./SIGNED-OFF-BY for the meaning:

https://github.com/bup/bup/blob/master/SIGNED-OFF-BY

After you submit the pull request, someone will eventually redirect it
to the list for review, and you will of course be included in the
conversation there.

On the other hand, if you're comfortable with "git send-email" (or the
equivalent), please post your patches to the list as described in the
"Submitting Patches" section in ./HACKING:

https://github.com/bup/bup/blob/master/HACKING

@rlbdv
Copy link
Copy Markdown
Member

rlbdv commented Nov 22, 2020

Thanks much. Would you be comfortable with the addition of a "Signed-off-by:" in the commit message? i.e. https://github.com/bup/bup/blob/master/SIGNED-OFF-BY

@kokopopse
Copy link
Copy Markdown
Contributor Author

Signed-off-by: JP MARMORAT jpmarmorat@gmail.com

Sorry i'm not familiar with the pull-request protocol
Is it sufficient or shall i redo the commit?

@kokopopse
Copy link
Copy Markdown
Contributor Author

kokopopse commented Nov 23, 2020 via email

@rlbdv
Copy link
Copy Markdown
Member

rlbdv commented Nov 24, 2020

Thanks. Would you be OK with just

Signed-off-by: Jean-Paul Marmorat <jean-paul.marmorat@mines-paristech.fr>

matching the commit "Author:", since we haven't really thought about how to handle multiple identifiers there yet, and it's generally been the author.

Signed-off-by: Jean-Paul Marmorat jean-paul.marmorat@mines-paristech.fr

index 7c8ca26..3797724 100755
--- a/lib/cmd/restore-cmd.py
+++ b/lib/cmd/restore-cmd.py
@@ -192,7 +192,7 @@ def restore(repo, parent_path, name, item, top, sparse, numeric_ids, owner_map,
             out.write(b'%s@ -> %s\n' % (fullname, meta.symlink_target))
     else:
         if verbosity >= 2:
-            out.write(fullname + '\n')
+            out.write(fullname + b'\n')

     orig_cwd = os.getcwd()
     try:
~
~
~
~
~
@kokopopse
Copy link
Copy Markdown
Contributor Author

kokopopse commented Nov 25, 2020 via email

@rlbdv rlbdv added the pending Accepted and should be in next push label Dec 19, 2020
@rlbdv
Copy link
Copy Markdown
Member

rlbdv commented Dec 20, 2020

Incorporated as a97b156. Thanks again.

@rlbdv rlbdv closed this Dec 20, 2020
@rlbdv rlbdv removed the pending Accepted and should be in next push label Dec 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants