From 2865f2421b357503f4f9bc310f3a98e0a9618e2a Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Aug 25 2017 20:48:02 +0000
Subject: avoid using encode_int in some of the client code


---

diff --git a/koji/__init__.py b/koji/__init__.py
index 6e3f1c2..9ecdfdf 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -2693,7 +2693,7 @@ class ClientSession(object):
             while True:
                 if debug:
                     self.logger.debug("uploadFile(%r,%r,%r,%r,%r,...)" %(path, name, sz, digest, offset))
-                if self.callMethod('uploadFile', path, name, encode_int(sz), digest, encode_int(offset), data, **volopts):
+                if self.callMethod('uploadFile', path, name, sz, digest, offset, data, **volopts):
                     break
                 if tries <= retries:
                     tries += 1
diff --git a/koji/daemon.py b/koji/daemon.py
index ba210a2..71f8bf0 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -60,7 +60,7 @@ def incremental_upload(session, fname, fd, path, retries=5, logger=None):
 
         tries = 0
         while True:
-            if session.uploadFile(path, fname, koji.encode_int(size), digest, koji.encode_int(offset), data):
+            if session.uploadFile(path, fname, size, digest, offset, data):
                 break
 
             if tries <= retries:
diff --git a/vm/kojivmd b/vm/kojivmd
index 1976f7b..5491ee9 100755
--- a/vm/kojivmd
+++ b/vm/kojivmd
@@ -731,8 +731,8 @@ class VMExecTask(BaseTaskHandler):
         """
         remotepath = os.path.dirname(os.path.join(self.getUploadDir(), filepath))
         filename = os.path.basename(filepath)
-        self.session.uploadFile(remotepath, filename, koji.encode_int(size),
-                                md5sum, koji.encode_int(offset), data)
+        self.session.uploadFile(remotepath, filename, size,
+                                md5sum, offset, data)
 
     def verifyChecksum(self, path, checksum, algo='sha1'):
         local_path = os.path.abspath(os.path.join(self.output_dir, path))
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index caa65a7..237e7d0 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -774,14 +774,13 @@ def getfile(environ, taskID, name, volume='DEFAULT', offset=None, size=None):
 
 def _chunk_file(server, environ, taskID, name, offset, size, volume):
     remaining = size
-    encode_int = koji.encode_int
     while True:
         if remaining <= 0:
             break
         chunk_size = 1048576
         if remaining < chunk_size:
             chunk_size = remaining
-        content = server.downloadTaskOutput(taskID, name, offset=encode_int(offset), size=chunk_size, volume=volume)
+        content = server.downloadTaskOutput(taskID, name, offset=offset, size=chunk_size, volume=volume)
         if not content:
             break
         yield content