summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2006-09-01 23:08:55 +0000
committerAndrew Gaffney <agaffney@gentoo.org>2006-09-01 23:08:55 +0000
commit0b9fb9a7ed6a757a81490a5ace36690b45f80676 (patch)
treef6fa1a9c3f46f9d7f5e054befce7f10b314f60c3 /src/installer
parentmissing comma (diff)
downloadgentoo-0b9fb9a7ed6a757a81490a5ace36690b45f80676.tar.gz
gentoo-0b9fb9a7ed6a757a81490a5ace36690b45f80676.tar.bz2
gentoo-0b9fb9a7ed6a757a81490a5ace36690b45f80676.zip
move imports from x86AT to GLIAT
Diffstat (limited to 'src/installer')
-rw-r--r--src/installer/src/GLIArchitectureTemplate.py6
-rw-r--r--src/installer/src/templates/x86ArchitectureTemplate.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/installer/src/GLIArchitectureTemplate.py b/src/installer/src/GLIArchitectureTemplate.py
index d9d4d022b1..d93a756ba9 100644
--- a/src/installer/src/GLIArchitectureTemplate.py
+++ b/src/installer/src/GLIArchitectureTemplate.py
@@ -5,7 +5,7 @@
# of which can be found in the main directory of this project.
Gentoo Linux Installer
-$Id: GLIArchitectureTemplate.py,v 1.286 2006/09/01 23:04:18 agaffney Exp $
+$Id: GLIArchitectureTemplate.py,v 1.287 2006/09/01 23:08:55 agaffney Exp $
The ArchitectureTemplate is largely meant to be an abstract class and an
interface (yes, it is both at the same time!). The purpose of this is to create
@@ -17,6 +17,10 @@ The only definitions that are filled in here are architecture independent.
import GLIUtility, GLILogger, os, string, sys, shutil, re, time
import GLIPortage
from GLIException import *
+import parted
+import GLIStorageDevice
+
+MEGABYTE = 1024 * 1024
class ArchitectureTemplate:
##
diff --git a/src/installer/src/templates/x86ArchitectureTemplate.py b/src/installer/src/templates/x86ArchitectureTemplate.py
index 8b974e0df4..dcbb374eb0 100644
--- a/src/installer/src/templates/x86ArchitectureTemplate.py
+++ b/src/installer/src/templates/x86ArchitectureTemplate.py
@@ -5,7 +5,7 @@
# of which can be found in the main directory of this project.
Gentoo Linux Installer
-$Id: x86ArchitectureTemplate.py,v 1.144 2006/09/01 23:04:18 agaffney Exp $
+$Id: x86ArchitectureTemplate.py,v 1.145 2006/09/01 23:08:55 agaffney Exp $
Copyright 2004 Gentoo Technologies Inc.
@@ -15,10 +15,6 @@ This fills in x86 specific functions.
import GLIUtility, string, time
from GLIArchitectureTemplate import ArchitectureTemplate
from GLIException import *
-import parted
-import GLIStorageDevice
-
-MEGABYTE = 1024 * 1024
class x86ArchitectureTemplate(ArchitectureTemplate):
def __init__(self,configuration=None, install_profile=None, client_controller=None):