From 63092ede051a9395d4ad004b21c186f2be1f5a46 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 28 2017 09:13:38 +0000
Subject: [PATCH 1/2] Log a little more info and fix a typo in a variable name


---

diff --git a/pagure-loadjson/pagure_loadjson_server.py b/pagure-loadjson/pagure_loadjson_server.py
index 0b4337a..0d61802 100644
--- a/pagure-loadjson/pagure_loadjson_server.py
+++ b/pagure-loadjson/pagure_loadjson_server.py
@@ -136,7 +136,9 @@ def handle_messages():
         _log.info(
             'Received: %s on channel: %s',
             repr(reply.value), reply.channel)
+        _log.info('Loading the json')
         data = json.loads(reply.value)
+        _log.info('Done: loading the json')
 
         commits = data['commits']
         abspath = data['abspath']
@@ -154,7 +156,7 @@ def handle_messages():
         session = pagure.lib.create_session(pagure.APP.config['DB_URL'])
 
         _log.info('Looking for project: %s%s of user: %s',
-                 '%s/' % namespacerepo if namespace else '',
+                 '%s/' % namespace if namespace else '',
                  repo, username)
         project = pagure.lib.get_project(
             session, repo, user=username, namespace=namespace)

From bb230518ff8a20e8ad90611dfcded134ecae3f97 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 28 2017 09:13:38 +0000
Subject: [PATCH 2/2] Only link the diff to the file if the PR is local and not remote


---

diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 30fa47c..aeac989 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- (c) 2014-2016 - Copyright Red Hat Inc
+ (c) 2014-2017 - Copyright Red Hat Inc
 
  Authors:
    Pierre-Yves Chibon <pingou@pingoured.fr>
@@ -140,7 +140,7 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None,
             continue
         if line.startswith('<div'):
             line = line.split('<pre style="line-height: 125%">')[1]
-            if prequest:
+            if prequest and prequest.project_from:
                 rangeline = line.partition('font-weight: bold">@@ ')[2] \
                     if line.partition('font-weight: bold">@@ ')[1] == \
                     'font-weight: bold">@@ ' else None