From 095450f50fc67e8f2270da639a77d4af05acda46 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 29 Jul 2016 12:58:56 +0530
Subject: [PATCH] [minor] remove pages from in remove-app

---
 frappe/__init__.py  |  5 ++++-
 frappe/installer.py | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index f19504b216..bb71573418 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -7,7 +7,7 @@ globals attached to frappe module
 from __future__ import unicode_literals
 
 from werkzeug.local import Local, release_local
-import os, importlib, inspect, json
+import os, sys, importlib, inspect, json
 
 # public
 from .exceptions import *
@@ -755,6 +755,9 @@ def get_hooks(hook=None, default=None, app_name=None):
 					# if app is not installed while restoring
 					# ignore it
 					pass
+				print 'Could not find app "{0}"'.format(app_name)
+				if not request:
+					sys.exit(1)
 				raise
 			for key in dir(app_hooks):
 				if not key.startswith("_"):
diff --git a/frappe/installer.py b/frappe/installer.py
index 68bffabfb4..32779b5048 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -180,7 +180,7 @@ def remove_app(app_name, dry_run=False):
 	for module_name in frappe.get_module_list(app_name):
 		for doctype in frappe.get_list("DocType", filters={"module": module_name},
 			fields=["name", "issingle"]):
-			print "removing {0}...".format(doctype.name)
+			print "removing DocType {0}...".format(doctype.name)
 			# drop table
 
 			if not dry_run:
@@ -189,7 +189,15 @@ def remove_app(app_name, dry_run=False):
 				if not doctype.issingle:
 					drop_doctypes.append(doctype.name)
 
+		for page in frappe.get_list("Page", filters={"module": module_name}):
+			print "removing Page {0}...".format(page.name)
+			# drop table
+
+			if not dry_run:
+				frappe.delete_doc("Page", page.name)
+
 		print "removing Module {0}...".format(module_name)
+
 		if not dry_run:
 			frappe.delete_doc("Module Def", module_name)